From 3256eb1ff65c3e58e623b927a0bb953830d8fe3d Mon Sep 17 00:00:00 2001
From: Chris Rossi <chris@archimedeanco.com>
Date: Thu, 30 Oct 2014 13:40:18 -0400
Subject: [PATCH 01/29] Architecture for arbitrary field overrides, field
 overrides for individual students, and a reimplementation of the individual
 due date feature.

This work introduces an architecture, used with the 'authored_data'
portion of LmsFieldData, which allows arbitrary field overrides to be
made for fields that are part of the course content or settings (Mongo
data).  The basic architecture is extensible by means of writing and
configuring arbitrary field override providers.

One concrete implementation of a field override provider is provided
which allows for overrides to be for individual students.  This provider
is then used as a basis for reimplementing the individual due date
extensions feature as a proof of concept for the design.

One can imagine writing override providers that provide overrides based
on a student's membership in a cohort or other similar idea.  This work
is being done, in fact, to pave the way for the Personal Online Courses
feature being developed by MIT, which will use an override provider very
much long those lines.
---
 common/lib/xmodule/xmodule/capa_base.py       |  11 +-
 .../xmodule/combined_open_ended_module.py     |  11 -
 common/lib/xmodule/xmodule/foldit_module.py   |  11 +-
 .../xmodule/modulestore/inheritance.py        |   8 -
 .../combined_open_ended_modulev1.py           |   3 +-
 .../xmodule/xmodule/peer_grading_module.py    |  14 +-
 common/lib/xmodule/xmodule/seq_module.py      |   8 -
 .../xmodule/xmodule/tests/test_capa_module.py |  15 +-
 conf/locale/eo/LC_MESSAGES/django.po          |  26 +--
 lms/djangoapps/courseware/field_overrides.py  | 205 ++++++++++++++++++
 lms/djangoapps/courseware/grades.py           |   3 +-
 .../0011_add_model_StudentFieldOverride.py    | 145 +++++++++++++
 lms/djangoapps/courseware/models.py           |  17 ++
 lms/djangoapps/courseware/module_render.py    |  17 +-
 .../courseware/student_field_overrides.py     |  71 ++++++
 lms/djangoapps/courseware/tests/animport.py   |   5 +
 .../courseware/tests/test_field_overrides.py  | 121 +++++++++++
 lms/djangoapps/instructor/tests/test_api.py   |  23 +-
 lms/djangoapps/instructor/tests/test_tools.py | 110 +++-------
 lms/djangoapps/instructor/views/tools.py      | 117 +++-------
 lms/envs/aws.py                               |   4 +
 lms/envs/common.py                            |  10 +
 22 files changed, 706 insertions(+), 249 deletions(-)
 create mode 100644 lms/djangoapps/courseware/field_overrides.py
 create mode 100644 lms/djangoapps/courseware/migrations/0011_add_model_StudentFieldOverride.py
 create mode 100644 lms/djangoapps/courseware/student_field_overrides.py
 create mode 100644 lms/djangoapps/courseware/tests/animport.py
 create mode 100644 lms/djangoapps/courseware/tests/test_field_overrides.py

diff --git a/common/lib/xmodule/xmodule/capa_base.py b/common/lib/xmodule/xmodule/capa_base.py
index 3b8ce984c2..3082933fe8 100644
--- a/common/lib/xmodule/xmodule/capa_base.py
+++ b/common/lib/xmodule/xmodule/capa_base.py
@@ -26,7 +26,6 @@ from xmodule.exceptions import NotFoundError
 from xblock.fields import Scope, String, Boolean, Dict, Integer, Float
 from .fields import Timedelta, Date
 from django.utils.timezone import UTC
-from .util.duedate import get_extended_due_date
 from xmodule.capa_base_constants import RANDOMIZATION, SHOWANSWER
 from django.conf import settings
 
@@ -107,14 +106,6 @@ 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
@@ -218,7 +209,7 @@ class CapaMixin(CapaFields):
     def __init__(self, *args, **kwargs):
         super(CapaMixin, self).__init__(*args, **kwargs)
 
-        due_date = get_extended_due_date(self)
+        due_date = self.due
 
         if self.graceperiod is not None and due_date:
             self.close_date = due_date + self.graceperiod
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 03b1f217d5..7e3d1fe8cc 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -23,7 +23,6 @@ V1_SETTINGS_ATTRIBUTES = [
     "accept_file_upload",
     "skip_spelling_checks",
     "due",
-    "extended_due",
     "graceperiod",
     "weight",
     "min_to_calibrate",
@@ -258,16 +257,6 @@ 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
diff --git a/common/lib/xmodule/xmodule/foldit_module.py b/common/lib/xmodule/xmodule/foldit_module.py
index 666d247bfd..de5957db94 100644
--- a/common/lib/xmodule/xmodule/foldit_module.py
+++ b/common/lib/xmodule/xmodule/foldit_module.py
@@ -8,7 +8,6 @@ from xmodule.x_module import XModule
 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__)
@@ -21,14 +20,6 @@ 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')
@@ -49,7 +40,7 @@ class FolditModule(FolditFields, XModule):
             show_leaderboard="false"/>
         """
         super(FolditModule, self).__init__(*args, **kwargs)
-        self.due_time = get_extended_due_date(self)
+        self.due_time = self.due
 
     def is_complete(self):
         """
diff --git a/common/lib/xmodule/xmodule/modulestore/inheritance.py b/common/lib/xmodule/xmodule/modulestore/inheritance.py
index 2727e2fa9c..d6293647c7 100644
--- a/common/lib/xmodule/xmodule/modulestore/inheritance.py
+++ b/common/lib/xmodule/xmodule/modulestore/inheritance.py
@@ -44,14 +44,6 @@ class InheritanceMixin(XBlockMixin):
         help=_("Enter the default date by which problems are due."),
         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,
-    )
     visible_to_staff_only = Boolean(
         help=_("If true, can be seen only by course staff, regardless of start date."),
         default=False,
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
index 8e49027203..d99884f392 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
@@ -8,7 +8,6 @@ from xmodule.progress import Progress
 from xmodule.stringify import stringify_children
 from xmodule.open_ended_grading_classes import self_assessment_module
 from xmodule.open_ended_grading_classes import open_ended_module
-from xmodule.util.duedate import get_extended_due_date
 from .combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST
 from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, MockPeerGradingService
 from xmodule.open_ended_grading_classes.openendedchild import OpenEndedChild
@@ -150,7 +149,7 @@ class CombinedOpenEndedV1Module(object):
             'peer_grade_finished_submissions_when_none_pending', False
         )
 
-        due_date = get_extended_due_date(instance_state)
+        due_date = instance_state.get('due', None)
         grace_period_string = instance_state.get('graceperiod', None)
         try:
             self.timeinfo = TimeInfo(due_date, grace_period_string)
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index 086580f06e..6e0da07a8f 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -11,7 +11,6 @@ from xmodule.fields import Date, Timedelta
 from xmodule.modulestore.exceptions import ItemNotFoundError, NoPathToItem
 from xmodule.raw_module import RawDescriptor
 from xmodule.timeinfo import TimeInfo
-from xmodule.util.duedate import get_extended_due_date
 from xmodule.x_module import XModule, module_attr
 from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, MockPeerGradingService
 
@@ -52,14 +51,6 @@ 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
@@ -141,8 +132,7 @@ class PeerGradingModule(PeerGradingFields, XModule):
                 self.linked_problem = self.system.get_module(linked_descriptors[0])
 
         try:
-            self.timeinfo = TimeInfo(
-                get_extended_due_date(self), self.graceperiod)
+            self.timeinfo = TimeInfo(self.due, self.graceperiod)
         except Exception:
             log.error("Error parsing due date information in location {0}".format(self.location))
             raise
@@ -570,7 +560,7 @@ class PeerGradingModule(PeerGradingFields, XModule):
             except (NoPathToItem, ItemNotFoundError):
                 continue
             if descriptor:
-                problem['due'] = get_extended_due_date(descriptor)
+                problem['due'] = descriptor.due
                 grace_period = descriptor.graceperiod
                 try:
                     problem_timeinfo = TimeInfo(problem['due'], grace_period)
diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py
index 1bdc289440..137b7dd31a 100644
--- a/common/lib/xmodule/xmodule/seq_module.py
+++ b/common/lib/xmodule/xmodule/seq_module.py
@@ -36,14 +36,6 @@ class SequenceFields(object):
         help=_("Enter the date by which problems are due."),
         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,
-    )
 
     # Entrance Exam flag -- see cms/contentstore/views/entrance_exam.py for usage
     is_entrance_exam = Boolean(
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index d1309fded4..2c666743ae 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -430,13 +430,6 @@ class CapaModuleTest(unittest.TestCase):
                                     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
@@ -1742,7 +1735,7 @@ class TestProblemCheckTracking(unittest.TestCase):
         self.maxDiff = None
 
     def test_choice_answer_text(self):
-        factory = self.capa_factory_for_problem_xml("""\
+        xml = """\
             <problem display_name="Multiple Choice Questions">
               <p>What color is the open ocean on a sunny day?</p>
               <optionresponse>
@@ -1767,7 +1760,11 @@ class TestProblemCheckTracking(unittest.TestCase):
                 </checkboxgroup>
               </choiceresponse>
             </problem>
-            """)
+            """
+
+        # Whitespace screws up comparisons
+        xml = ''.join(line.strip() for line in xml.split('\n'))
+        factory = self.capa_factory_for_problem_xml(xml)
         module = factory.create()
 
         answer_input_dict = {
diff --git a/conf/locale/eo/LC_MESSAGES/django.po b/conf/locale/eo/LC_MESSAGES/django.po
index 9114ffed40..eb351c00af 100644
--- a/conf/locale/eo/LC_MESSAGES/django.po
+++ b/conf/locale/eo/LC_MESSAGES/django.po
@@ -1554,19 +1554,6 @@ msgstr ""
 msgid "Date that this problem is due by"
 msgstr "Däté thät thïs prößlém ïs düé ßý Ⱡ'σяєм ι#"
 
-#: common/lib/xmodule/xmodule/capa_base.py
-#: common/lib/xmodule/xmodule/combined_open_ended_module.py
-#: common/lib/xmodule/xmodule/peer_grading_module.py
-msgid ""
-"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."
-msgstr ""
-"Däté thät thïs prößlém ïs düé ßý för ä pärtïçülär stüdént. Thïs çän ßé sét "
-"ßý än ïnstrüçtör, änd wïll övérrïdé thé glößäl düé däté ïf ït ïs sét tö ä "
-"däté thät ïs lätér thän thé glößäl düé däté. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
-"¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє#"
-
 #: common/lib/xmodule/xmodule/capa_base.py
 #: common/lib/xmodule/xmodule/combined_open_ended_module.py
 msgid "Amount of time after the due date that submissions will be accepted"
@@ -11920,6 +11907,19 @@ msgstr "änd çhöösé ýöür stüdént träçk Ⱡ'σяєм #"
 msgid "and proceed to verification"
 msgstr "änd pröçééd tö vérïfïçätïön Ⱡ'σяєм#"
 
+#. Translators: This line appears next a checkbox which users can leave
+#. checked
+#. or uncheck in order
+#. to indicate whether they want to receive emails from the organization
+#. offering the course.
+#: lms/templates/courseware/mktg_course_about.html
+msgid ""
+"I would like to receive email about other {organization_full_name} programs "
+"and offers."
+msgstr ""
+"Ì wöüld lïké tö réçéïvé émäïl äßöüt öthér {organization_full_name} prögräms "
+"änd öfférs. Ⱡ'σяєм ιρѕυм ∂σłσя #"
+
 #: lms/templates/courseware/mktg_course_about.html
 msgid "Enrollment Is Closed"
 msgstr "Énröllmént Ìs Çlöséd Ⱡ'σя#"
diff --git a/lms/djangoapps/courseware/field_overrides.py b/lms/djangoapps/courseware/field_overrides.py
new file mode 100644
index 0000000000..2901d81953
--- /dev/null
+++ b/lms/djangoapps/courseware/field_overrides.py
@@ -0,0 +1,205 @@
+"""
+This module provides a :class:`~xblock.field_data.FieldData` implementation
+which wraps an other `FieldData` object and provides overrides based on the
+user.  The use of providers allows for overrides that are arbitrarily
+extensible.  One provider is found in `courseware.student_field_overrides`
+which allows for fields to be overridden for individual students.  One can
+envision other providers being written that allow for fields to be overridden
+base on membership of a student in a cohort, or similar.  The use of an
+extensible, modular architecture allows for overrides being done in ways not
+envisioned by the authors.
+
+Currently, this module is used in the `module_render` module in this same
+package and is used to wrap the `authored_data` when constructing an
+`LmsFieldData`.  This means overrides will be in effect for all scopes covered
+by `authored_data`, e.g. course content and settings stored in Mongo.
+"""
+import threading
+
+from abc import ABCMeta, abstractmethod
+from contextlib import contextmanager
+from django.conf import settings
+from xblock.field_data import FieldData
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.inheritance import InheritanceMixin
+
+
+NOTSET = object()
+
+
+def resolve_dotted(name):
+    """
+    Given the dotted name for a Python object, performs any necessary imports
+    and returns the object.
+    """
+    names = name.split('.')
+    path = names.pop(0)
+    target = __import__(path)
+    while names:
+        segment = names.pop(0)
+        path += '.' + segment
+        try:
+            target = getattr(target, segment)
+        except AttributeError:
+            __import__(path)
+            target = getattr(target, segment)
+    return target
+
+
+class OverrideFieldData(FieldData):
+    """
+    A :class:`~xblock.field_data.FieldData` which wraps another `FieldData`
+    object and allows for fields handled by the wrapped `FieldData` to be
+    overriden by arbitrary providers.
+
+    Providers are configured by use of the Django setting,
+    `FIELD_OVERRIDE_PROVIDERS` which should be a tuple of dotted names of
+    :class:`FieldOverrideProvider` concrete implementations.  Note that order
+    is important for this setting.  Override providers will tried in the order
+    configured in the setting.  The first provider to find an override 'wins'
+    for a particular field lookup.
+    """
+    provider_classes = None
+
+    @classmethod
+    def wrap(cls, user, wrapped):
+        """
+        Will return a :class:`OverrideFieldData` which wraps the field data
+        given in `wrapped` for the given `user`, if override providers are
+        configred.  If no override providers are configured, using the Django
+        setting, `FIELD_OVERRIDE_PROVIDERS`, returns `wrapped`, eliminating
+        any performance impact of this feature if no override providers are
+        configured.
+        """
+        if cls.provider_classes is None:
+            cls.provider_classes = tuple(
+                (resolve_dotted(name) for name in
+                 settings.FIELD_OVERRIDE_PROVIDERS))
+
+        if cls.provider_classes:
+            return cls(user, wrapped)
+
+        return wrapped
+
+    def __init__(self, user, fallback):
+        self.fallback = fallback
+        self.providers = tuple((cls(user) for cls in self.provider_classes))
+
+    def get_override(self, block, name):
+        """
+        Checks for an override for the field identified by `name` in `block`.
+        Returns the overridden value or `NOTSET` if no override is found.
+        """
+        if not overrides_disabled():
+            for provider in self.providers:
+                value = provider.get(block, name, NOTSET)
+                if value is not NOTSET:
+                    return value
+        return NOTSET
+
+    def get(self, block, name):
+        value = self.get_override(block, name)
+        if value is not NOTSET:
+            return value
+        return self.fallback.get(block, name)
+
+    def set(self, block, name, value):
+        self.fallback.set(block, name, value)
+
+    def delete(self, block, name):
+        self.fallback.delete(block, name)
+
+    def has(self, block, name):
+        has = self.get_override(block, name)
+        if has is NOTSET:
+            # If this is an inheritable field and an override is set above,
+            # then we want to return False here, so the field_data uses the
+            # override and not the original value for this block.
+            inheritable = InheritanceMixin.fields.keys()
+            if name in inheritable:
+                for ancestor in _lineage(block):
+                    if self.get_override(ancestor, name) is not NOTSET:
+                        return False
+
+        return has is not NOTSET or self.fallback.has(block, name)
+
+    def set_many(self, block, update_dict):
+        return self.fallback.set_many(block, update_dict)
+
+    def default(self, block, name):
+        # The `default` method is overloaded by the field storage system to
+        # also handle inheritance.
+        if not overrides_disabled():
+            inheritable = InheritanceMixin.fields.keys()
+            if name in inheritable:
+                for ancestor in _lineage(block):
+                    value = self.get_override(ancestor, name)
+                    if value is not NOTSET:
+                        return value
+        return self.fallback.default(block, name)
+
+
+class _OverridesDisabled(threading.local):
+    """
+    A thread local used to manage state of overrides being disabled or not.
+    """
+    disabled = ()
+
+
+_OVERRIDES_DISABLED = _OverridesDisabled()
+
+
+@contextmanager
+def disable_overrides():
+    """
+    A context manager which disables field overrides inside the context of a
+    `with` statement, allowing code to get at the `original` value of a field.
+    """
+    prev = _OVERRIDES_DISABLED.disabled
+    _OVERRIDES_DISABLED.disabled += (True,)
+    yield
+    _OVERRIDES_DISABLED.disabled = prev
+
+
+def overrides_disabled():
+    """
+    Checks to see whether overrides are disabled in the current context.
+    Returns a boolean value.  See `disable_overrides`.
+    """
+    return bool(_OVERRIDES_DISABLED.disabled)
+
+
+class FieldOverrideProvider(object):
+    """
+    Abstract class which defines the interface that a `FieldOverrideProvider`
+    must provide.  In general, providers should derive from this class, but
+    it's not strictly necessary as long as they correctly implement this
+    interface.
+
+    A `FieldOverrideProvider` implementation is only responsible for looking up
+    field overrides. To set overrides, there will be a domain specific API for
+    the concrete override implementation being used.
+    """
+    __metaclass__ = ABCMeta
+
+    def __init__(self, user):
+        self.user = user
+
+    @abstractmethod
+    def get(self, block, name, default):  # pragma no cover
+        """
+        Look for an override value for the field named `name` in `block`.
+        Returns the overridden value or `default` if no override is found.
+        """
+        raise NotImplementedError
+
+
+def _lineage(block):
+    """
+    Returns an iterator over all ancestors of the given block, starting with
+    its immediate parent and ending at the root of the block tree.
+    """
+    location = modulestore().get_parent_location(block.location)
+    while location:
+        yield modulestore().get_item(location)
+        location = modulestore().get_parent_location(location)
diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index 3db3cb8f35..1abfe2c092 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -20,7 +20,6 @@ from xmodule import graders
 from xmodule.graders import Score
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
-from xmodule.util.duedate import get_extended_due_date
 from .models import StudentModule
 from .module_render import get_module_for_descriptor
 from submissions import api as sub_api  # installed from the edx-submissions repository
@@ -373,7 +372,7 @@ def _progress_summary(student, request, course):
                     'scores': scores,
                     'section_total': section_total,
                     'format': module_format,
-                    'due': get_extended_due_date(section_module),
+                    'due': section_module.due,
                     'graded': graded,
                 })
 
diff --git a/lms/djangoapps/courseware/migrations/0011_add_model_StudentFieldOverride.py b/lms/djangoapps/courseware/migrations/0011_add_model_StudentFieldOverride.py
new file mode 100644
index 0000000000..d8f5caadd6
--- /dev/null
+++ b/lms/djangoapps/courseware/migrations/0011_add_model_StudentFieldOverride.py
@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'StudentFieldOverride'
+        db.create_table('courseware_studentfieldoverride', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('course_id', self.gf('xmodule_django.models.CourseKeyField')(max_length=255, db_index=True)),
+            ('location', self.gf('xmodule_django.models.LocationKeyField')(max_length=255, db_index=True)),
+            ('student', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('field', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('value', self.gf('django.db.models.fields.TextField')(default='null')),
+        ))
+        db.send_create_signal('courseware', ['StudentFieldOverride'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'StudentFieldOverride'
+        db.delete_table('courseware_studentfieldoverride')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'courseware.offlinecomputedgrade': {
+            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'OfflineComputedGrade'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'gradeset': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'courseware.offlinecomputedgradelog': {
+            'Meta': {'ordering': "['-created']", 'object_name': 'OfflineComputedGradeLog'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nstudents': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'seconds': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'courseware.studentfieldoverride': {
+            'Meta': {'unique_together': "(('course_id', 'location', 'student'),)", 'object_name': 'StudentFieldOverride'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.studentmodule': {
+            'Meta': {'unique_together': "(('student', 'module_state_key', 'course_id'),)", 'object_name': 'StudentModule'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'done': ('django.db.models.fields.CharField', [], {'default': "'na'", 'max_length': '8', 'db_index': 'True'}),
+            'grade': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_state_key': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_column': "'module_id'", 'db_index': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'courseware.studentmodulehistory': {
+            'Meta': {'object_name': 'StudentModuleHistory'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'student_module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['courseware.StudentModule']"}),
+            'version': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'courseware.xmodulestudentinfofield': {
+            'Meta': {'unique_together': "(('student', 'field_name'),)", 'object_name': 'XModuleStudentInfoField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.xmodulestudentprefsfield': {
+            'Meta': {'unique_together': "(('student', 'module_type', 'field_name'),)", 'object_name': 'XModuleStudentPrefsField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.xmoduleuserstatesummaryfield': {
+            'Meta': {'unique_together': "(('usage_id', 'field_name'),)", 'object_name': 'XModuleUserStateSummaryField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'usage_id': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        }
+    }
+
+    complete_apps = ['courseware']
\ No newline at end of file
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index f477b10e04..75a7afffa3 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -230,3 +230,20 @@ class OfflineComputedGradeLog(models.Model):
 
     def __unicode__(self):
         return "[OCGLog] %s: %s" % (self.course_id.to_deprecated_string(), self.created)  # pylint: disable=no-member
+
+
+class StudentFieldOverride(models.Model):
+    """
+    Holds the value of a specific field overriden for a student.  This is used
+    by the code in the `courseware.student_field_overrides` module to provide
+    overrides of xblock fields on a per user basis.
+    """
+    course_id = CourseKeyField(max_length=255, db_index=True)
+    location = LocationKeyField(max_length=255, db_index=True)
+    student = models.ForeignKey(User, db_index=True)
+
+    class Meta:   # pylint: disable=missing-docstring
+        unique_together = (('course_id', 'location', 'student'),)
+
+    field = models.CharField(max_length=255)
+    value = models.TextField(default='null')
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 799c71eafc..923827e84d 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -54,7 +54,6 @@ from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import modulestore, ModuleI18nService
 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,
@@ -71,6 +70,8 @@ from util.sandboxing import can_execute_unsafe_code, get_python_lib_zip
 from util import milestones_helpers
 from util.module_utils import yield_dynamic_descriptor_descendents
 
+from .field_overrides import OverrideFieldData
+
 log = logging.getLogger(__name__)
 
 
@@ -170,7 +171,7 @@ def toc_for_course(request, course, active_chapter, active_section, field_data_c
                     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': get_extended_due_date(section),
+                                     'due': section.due,
                                      'active': active,
                                      'graded': section.graded,
                                      })
@@ -496,11 +497,17 @@ def get_module_system_for_user(user, field_data_cache,
             request_token=request_token
         )
         # rebinds module to a different student.  We'll change system, student_data, and scope_ids
+        authored_data = OverrideFieldData.wrap(
+            real_user, module.descriptor._field_data  # pylint: disable=protected-access
+        )
         module.descriptor.bind_for_student(
             inner_system,
-            LmsFieldData(module.descriptor._field_data, inner_student_data),  # pylint: disable=protected-access
+            LmsFieldData(authored_data, inner_student_data),
             real_user.id,
         )
+        module.descriptor.scope_ids = (
+            module.descriptor.scope_ids._replace(user_id=real_user.id)  # pylint: disable=protected-access
+        )
         module.scope_ids = module.descriptor.scope_ids  # this is needed b/c NamedTuples are immutable
         # now bind the module to the new ModuleSystem instance and vice-versa
         module.runtime = inner_system
@@ -689,7 +696,9 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
         request_token=request_token
     )
 
-    descriptor.bind_for_student(system, field_data, user.id)  # pylint: disable=protected-access
+    authored_data = OverrideFieldData.wrap(user, descriptor._field_data)  # pylint: disable=protected-access
+    descriptor.bind_for_student(system, LmsFieldData(authored_data, field_data), user.id)
+    descriptor.scope_ids = descriptor.scope_ids._replace(user_id=user.id)  # pylint: disable=protected-access
     return descriptor
 
 
diff --git a/lms/djangoapps/courseware/student_field_overrides.py b/lms/djangoapps/courseware/student_field_overrides.py
new file mode 100644
index 0000000000..1e22efa6bc
--- /dev/null
+++ b/lms/djangoapps/courseware/student_field_overrides.py
@@ -0,0 +1,71 @@
+"""
+API related to providing field overrides for individual students.  This is used
+by the individual due dates feature.
+"""
+import json
+
+from .field_overrides import FieldOverrideProvider
+from .models import StudentFieldOverride
+
+
+class IndividualStudentOverrideProvider(FieldOverrideProvider):
+    """
+    A concrete implementation of
+    :class:`~courseware.field_overrides.FieldOverrideProvider` which allows for
+    overrides to be made on a per user basis.
+    """
+    def get(self, block, name, default):
+        return get_override_for_user(self.user, block, name, default)
+
+
+def get_override_for_user(user, block, name, default=None):
+    """
+    Gets the value of the overridden field for the `user`.  `block` and `name`
+    specify the block and the name of the field.  If the field is not
+    overridden for the given user, returns `default`.
+    """
+    try:
+        override = StudentFieldOverride.objects.get(
+            course_id=block.runtime.course_id,
+            location=block.location,
+            student_id=user.id,
+            field=name
+        )
+        field = block.fields[name]
+        return field.from_json(json.loads(override.value))
+    except StudentFieldOverride.DoesNotExist:
+        pass
+    return default
+
+
+def override_field_for_user(user, block, name, value):
+    """
+    Overrides a field for the `user`.  `block` and `name` specify the block
+    and the name of the field on that block to override.  `value` is the
+    value to set for the given field.
+    """
+    override, _ = StudentFieldOverride.objects.get_or_create(
+        course_id=block.runtime.course_id,
+        location=block.location,
+        student_id=user.id,
+        field=name)
+    field = block.fields[name]
+    override.value = json.dumps(field.to_json(value))
+    override.save()
+
+
+def clear_override_for_user(user, block, name):
+    """
+    Clears a previously set field override for the `user`.  `block` and `name`
+    specify the block and the name of the field on that block to clear.
+    This function is idempotent--if no override is set, nothing action is
+    performed.
+    """
+    try:
+        StudentFieldOverride.objects.get(
+            course_id=block.runtime.course_id,
+            student_id=user.id,
+            location=block.location,
+            field=name).delete()
+    except StudentFieldOverride.DoesNotExist:
+        pass
diff --git a/lms/djangoapps/courseware/tests/animport.py b/lms/djangoapps/courseware/tests/animport.py
new file mode 100644
index 0000000000..268d0bb205
--- /dev/null
+++ b/lms/djangoapps/courseware/tests/animport.py
@@ -0,0 +1,5 @@
+"""
+A class which never gets imported except for in
+:meth:`~courseware.tests.test_field_overrides.ResolveDottedTests.test_import_something_that_isnt_already_loaded`.
+"""
+SOMENAME = 'bar'
diff --git a/lms/djangoapps/courseware/tests/test_field_overrides.py b/lms/djangoapps/courseware/tests/test_field_overrides.py
new file mode 100644
index 0000000000..77ea374f4c
--- /dev/null
+++ b/lms/djangoapps/courseware/tests/test_field_overrides.py
@@ -0,0 +1,121 @@
+"""
+Tests for `field_overrides` module.
+"""
+import unittest
+
+from django.test import TestCase
+from django.test.utils import override_settings
+from xblock.field_data import DictFieldData
+
+from ..field_overrides import (
+    disable_overrides,
+    FieldOverrideProvider,
+    OverrideFieldData,
+    resolve_dotted,
+)
+
+
+TESTUSER = object()
+
+
+@override_settings(FIELD_OVERRIDE_PROVIDERS=(
+    'courseware.tests.test_field_overrides.TestOverrideProvider',))
+class OverrideFieldDataTests(TestCase):
+    """
+    Tests for `OverrideFieldData`.
+    """
+
+    def setUp(self):
+        OverrideFieldData.provider_classes = None
+
+    def tearDown(self):
+        OverrideFieldData.provider_classes = None
+
+    def make_one(self):
+        """
+        Factory method.
+        """
+        return OverrideFieldData.wrap(TESTUSER, DictFieldData({
+            'foo': 'bar',
+            'bees': 'knees',
+        }))
+
+    def test_get(self):
+        data = self.make_one()
+        self.assertEqual(data.get('block', 'foo'), 'fu')
+        self.assertEqual(data.get('block', 'bees'), 'knees')
+        with disable_overrides():
+            self.assertEqual(data.get('block', 'foo'), 'bar')
+
+    def test_set(self):
+        data = self.make_one()
+        data.set('block', 'foo', 'yowza')
+        self.assertEqual(data.get('block', 'foo'), 'fu')
+        with disable_overrides():
+            self.assertEqual(data.get('block', 'foo'), 'yowza')
+
+    def test_delete(self):
+        data = self.make_one()
+        data.delete('block', 'foo')
+        self.assertEqual(data.get('block', 'foo'), 'fu')
+        with disable_overrides():
+            # Since field_data is responsible for attribute access, you'd
+            # expect it to raise AttributeError. In fact, it raises KeyError,
+            # so we check for that.
+            with self.assertRaises(KeyError):
+                data.get('block', 'foo')
+
+    def test_has(self):
+        data = self.make_one()
+        self.assertTrue(data.has('block', 'foo'))
+        self.assertTrue(data.has('block', 'bees'))
+        self.assertTrue(data.has('block', 'oh'))
+        with disable_overrides():
+            self.assertFalse(data.has('block', 'oh'))
+
+    def test_many(self):
+        data = self.make_one()
+        data.set_many('block', {'foo': 'baz', 'ah': 'ic'})
+        self.assertEqual(data.get('block', 'foo'), 'fu')
+        self.assertEqual(data.get('block', 'ah'), 'ic')
+        with disable_overrides():
+            self.assertEqual(data.get('block', 'foo'), 'baz')
+
+    @override_settings(FIELD_OVERRIDE_PROVIDERS=())
+    def test_no_overrides_configured(self):
+        data = self.make_one()
+        self.assertIsInstance(data, DictFieldData)
+
+
+class ResolveDottedTests(unittest.TestCase):
+    """
+    Tests for `resolve_dotted`.
+    """
+
+    def test_bad_sub_import(self):
+        with self.assertRaises(ImportError):
+            resolve_dotted('courseware.tests.test_foo')
+
+    def test_bad_import(self):
+        with self.assertRaises(ImportError):
+            resolve_dotted('nosuchpackage')
+
+    def test_import_something_that_isnt_already_loaded(self):
+        self.assertEqual(
+            resolve_dotted('courseware.tests.animport.SOMENAME'),
+            'bar'
+        )
+
+
+class TestOverrideProvider(FieldOverrideProvider):
+    """
+    A concrete implementation of `FieldOverrideProvider` for testing.
+    """
+    def get(self, block, name, default):
+        assert self.user is TESTUSER
+        assert block == 'block'
+        if name == 'foo':
+            return 'fu'
+        if name == 'oh':
+            return 'man'
+        return default
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index 77624cfdd8..d9a399e0bf 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -50,6 +50,9 @@ from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+from xmodule.fields import Date
+
+from courseware.models import StudentFieldOverride
 
 import instructor_task.api
 import instructor.views.api
@@ -61,8 +64,8 @@ from instructor_task.api_helper import AlreadyRunningError
 from openedx.core.djangoapps.course_groups.cohorts import set_course_cohort_settings
 
 from .test_tools import msk_from_problem_urlname
-from ..views.tools import get_extended_due
 
+DATE_FIELD = Date()
 EXPECTED_CSV_HEADER = (
     '"code","redeem_code_url","course_id","company_name","created_by","redeemed_by","invoice_id","purchaser",'
     '"customer_reference_number","internal_reference"'
@@ -3114,6 +3117,24 @@ class TestInstructorAPIHelpers(TestCase):
         msk_from_problem_urlname(*args)
 
 
+def get_extended_due(course, unit, user):
+    """
+    Gets the overridden due date for the given user on the given unit.  Returns
+    `None` if there is no override set.
+    """
+    try:
+        override = StudentFieldOverride.objects.get(
+            course_id=course.id,
+            student=user,
+            location=unit.location,
+            field='due'
+        )
+        return DATE_FIELD.from_json(json.loads(override.value))
+    except StudentFieldOverride.DoesNotExist:
+        return None
+
+
+@override_settings(MODULESTORE=TEST_DATA_MOCK_MODULESTORE)
 class TestDueDateExtensions(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Test data dumps for reporting.
diff --git a/lms/djangoapps/instructor/tests/test_tools.py b/lms/djangoapps/instructor/tests/test_tools.py
index 9724eb7bcd..1f6e596b63 100644
--- a/lms/djangoapps/instructor/tests/test_tools.py
+++ b/lms/djangoapps/instructor/tests/test_tools.py
@@ -3,14 +3,15 @@ Tests for views/tools.py.
 """
 
 import datetime
-import functools
 import mock
 import json
 import unittest
 
 from django.utils.timezone import utc
+from django.test.utils import override_settings
 
 from courseware.models import StudentModule
+from courseware.field_overrides import OverrideFieldData
 from student.tests.factories import UserFactory
 from xmodule.fields import Date
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -180,6 +181,10 @@ class TestTitleOrUrl(unittest.TestCase):
         self.assertEquals(tools.title_or_url(unit), 'test:hello')
 
 
+@override_settings(
+    FIELD_OVERRIDE_PROVIDERS=(
+        'courseware.student_field_overrides.IndividualStudentOverrideProvider',),
+)
 class TestSetDueDateExtension(ModuleStoreTestCase):
     """
     Test the set_due_date_extensions function.
@@ -189,53 +194,53 @@ class TestSetDueDateExtension(ModuleStoreTestCase):
         Fixtures.
         """
         super(TestSetDueDateExtension, self).setUp()
+        OverrideFieldData.provider_classes = None
 
-        due = datetime.datetime(2010, 5, 12, 2, 42, tzinfo=utc)
+        self.due = due = datetime.datetime(2010, 5, 12, 2, 42, tzinfo=utc)
         course = CourseFactory.create()
         week1 = ItemFactory.create(due=due, parent=course)
         week2 = ItemFactory.create(due=due, parent=course)
         week3 = ItemFactory.create(parent=course)
-
-        homework = ItemFactory.create(
-            parent=week1,
-            due=due
-        )
+        homework = ItemFactory.create(parent=week1)
+        assignment = ItemFactory.create(parent=homework, due=due)
 
         user = UserFactory.create()
-        StudentModule(
-            state='{}',
-            student_id=user.id,
-            course_id=course.id,
-            module_state_key=week1.location).save()
-        StudentModule(
-            state='{}',
-            student_id=user.id,
-            course_id=course.id,
-            module_state_key=homework.location).save()
 
         self.course = course
         self.week1 = week1
         self.homework = homework
+        self.assignment = assignment
         self.week2 = week2
         self.week3 = week3
         self.user = user
 
-        self.extended_due = functools.partial(
-            tools.get_extended_due, course, student=user)
+        # Apparently the test harness doesn't use LmsFieldStorage, and I'm not
+        # sure if there's a way to poke the test harness to do so.  So, we'll
+        # just inject the override field storage in this brute force manner.
+        for block in (course, week1, week2, week3, homework, assignment):
+            block._field_data = OverrideFieldData.wrap(  # pylint: disable=protected-access
+                user, block._field_data)  # pylint: disable=protected-access
+
+    def tearDown(self):
+        OverrideFieldData.provider_classes = None
+
+    def _clear_field_data_cache(self):
+        """
+        Clear field data cache for xblocks under test. Normally this would be
+        done by virtue of the fact that xblocks are reloaded on subsequent
+        requests.
+        """
+        for block in (self.week1, self.week2, self.week3,
+                      self.homework, self.assignment):
+            block.fields['due']._del_cached_value(block)  # pylint: disable=protected-access
 
     def test_set_due_date_extension(self):
         extended = datetime.datetime(2013, 12, 25, 0, 0, tzinfo=utc)
         tools.set_due_date_extension(self.course, self.week1, self.user, extended)
-        self.assertEqual(self.extended_due(self.week1), extended)
-        self.assertEqual(self.extended_due(self.homework), extended)
-
-    def test_set_due_date_extension_create_studentmodule(self):
-        extended = datetime.datetime(2013, 12, 25, 0, 0, tzinfo=utc)
-        user = UserFactory.create()  # No student modules for this user
-        tools.set_due_date_extension(self.course, self.week1, user, extended)
-        extended_due = functools.partial(tools.get_extended_due, self.course, student=user)
-        self.assertEqual(extended_due(self.week1), extended)
-        self.assertEqual(extended_due(self.homework), extended)
+        self._clear_field_data_cache()
+        self.assertEqual(self.week1.due, extended)
+        self.assertEqual(self.homework.due, extended)
+        self.assertEqual(self.assignment.due, extended)
 
     def test_set_due_date_extension_invalid_date(self):
         extended = datetime.datetime(2009, 1, 1, 0, 0, tzinfo=utc)
@@ -251,8 +256,7 @@ class TestSetDueDateExtension(ModuleStoreTestCase):
         extended = datetime.datetime(2013, 12, 25, 0, 0, tzinfo=utc)
         tools.set_due_date_extension(self.course, self.week1, self.user, extended)
         tools.set_due_date_extension(self.course, self.week1, self.user, None)
-        self.assertEqual(self.extended_due(self.week1), None)
-        self.assertEqual(self.extended_due(self.homework), None)
+        self.assertEqual(self.week1.due, self.due)
 
 
 class TestDataDumps(ModuleStoreTestCase):
@@ -278,51 +282,7 @@ class TestDataDumps(ModuleStoreTestCase):
         )
 
         user1 = UserFactory.create()
-        StudentModule(
-            state='{}',
-            student_id=user1.id,
-            course_id=course.id,
-            module_state_key=week1.location).save()
-        StudentModule(
-            state='{}',
-            student_id=user1.id,
-            course_id=course.id,
-            module_state_key=week2.location).save()
-        StudentModule(
-            state='{}',
-            student_id=user1.id,
-            course_id=course.id,
-            module_state_key=week3.location).save()
-        StudentModule(
-            state='{}',
-            student_id=user1.id,
-            course_id=course.id,
-            module_state_key=homework.location).save()
-
         user2 = UserFactory.create()
-        StudentModule(
-            state='{}',
-            student_id=user2.id,
-            course_id=course.id,
-            module_state_key=week1.location).save()
-        StudentModule(
-            state='{}',
-            student_id=user2.id,
-            course_id=course.id,
-            module_state_key=homework.location).save()
-
-        user3 = UserFactory.create()
-        StudentModule(
-            state='{}',
-            student_id=user3.id,
-            course_id=course.id,
-            module_state_key=week1.location).save()
-        StudentModule(
-            state='{}',
-            student_id=user3.id,
-            course_id=course.id,
-            module_state_key=homework.location).save()
-
         self.course = course
         self.week1 = week1
         self.homework = homework
diff --git a/lms/djangoapps/instructor/views/tools.py b/lms/djangoapps/instructor/views/tools.py
index 3959e2e2fb..d1bbb66269 100644
--- a/lms/djangoapps/instructor/views/tools.py
+++ b/lms/djangoapps/instructor/views/tools.py
@@ -10,7 +10,13 @@ from django.http import HttpResponseBadRequest
 from django.utils.timezone import utc
 from django.utils.translation import ugettext as _
 
-from courseware.models import StudentModule
+from courseware.models import StudentFieldOverride
+from courseware.field_overrides import disable_overrides
+from courseware.student_field_overrides import (
+    clear_override_for_user,
+    get_override_for_user,
+    override_field_for_user,
+)
 from xmodule.fields import Date
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
@@ -175,22 +181,6 @@ def title_or_url(node):
     return title
 
 
-def get_extended_due(course, unit, student):
-    """
-    Get the extended due date out of a student's state for a particular unit.
-    """
-    student_module = StudentModule.objects.get(
-        student_id=student.id,
-        course_id=course.id,
-        module_state_key=unit.location
-    )
-
-    state = json.loads(student_module.state)
-    extended = state.get('extended_due', None)
-    if extended:
-        return DATE_FIELD.from_json(extended)
-
-
 def set_due_date_extension(course, unit, student, due_date):
     """
     Sets a due date extension. Raises DashboardError if the unit or extended
@@ -198,56 +188,22 @@ def set_due_date_extension(course, unit, student, due_date):
     """
     if due_date:
         # Check that the new due date is valid:
-        original_due_date = getattr(unit, 'due', None)
+        with disable_overrides():
+            original_due_date = getattr(unit, 'due', None)
 
         if not original_due_date:
             raise DashboardError(_("Unit {0} has no due date to extend.").format(unit.location))
         if due_date < original_due_date:
             raise DashboardError(_("An extended due date must be later than the original due date."))
+
+        override_field_for_user(student, unit, 'due', due_date)
+
     else:
         # We are deleting a due date extension. Check that it exists:
-        if not get_extended_due(course, unit, student):
+        if not get_override_for_user(student, unit, 'due'):
             raise DashboardError(_("No due date extension is set for that student and unit."))
 
-    def set_due_date(node):
-        """
-        Recursively set the due date on a node and all of its children.
-        """
-        try:
-            student_module = StudentModule.objects.get(
-                student_id=student.id,
-                course_id=course.id,
-                module_state_key=node.location
-            )
-            state = json.loads(student_module.state)
-
-        except StudentModule.DoesNotExist:
-            # Normally, a StudentModule is created as a side effect of assigning
-            # a value to a property in an XModule or XBlock which has a scope
-            # of 'Scope.user_state'.  Here, we want to alter user state but
-            # can't use the standard XModule/XBlock machinery to do so, because
-            # it fails to take into account that the state being altered might
-            # belong to a student other than the one currently logged in.  As a
-            # result, in our work around, we need to detect whether the
-            # StudentModule has been created for the given student on the given
-            # unit and create it if it is missing, so we can use it to store
-            # the extended due date.
-            student_module = StudentModule.objects.create(
-                student_id=student.id,
-                course_id=course.id,
-                module_state_key=node.location,
-                module_type=node.category
-            )
-            state = {}
-
-        state['extended_due'] = DATE_FIELD.to_json(due_date)
-        student_module.state = json.dumps(state)
-        student_module.save()
-
-        for child in node.get_children():
-            set_due_date(child)
-
-    set_due_date(unit)
+        clear_override_for_user(student, unit, 'due')
 
 
 def dump_module_extensions(course, unit):
@@ -257,20 +213,17 @@ def dump_module_extensions(course, unit):
     """
     data = []
     header = [_("Username"), _("Full Name"), _("Extended Due Date")]
-    query = StudentModule.objects.filter(
+    query = StudentFieldOverride.objects.filter(
         course_id=course.id,
-        module_state_key=unit.location)
-    for module in query:
-        state = json.loads(module.state)
-        extended_due = state.get("extended_due")
-        if not extended_due:
-            continue
-        extended_due = DATE_FIELD.from_json(extended_due)
-        extended_due = extended_due.strftime("%Y-%m-%d %H:%M")
-        fullname = module.student.profile.name
+        location=unit.location,
+        field='due')
+    for override in query:
+        due = DATE_FIELD.from_json(json.loads(override.value))
+        due = due.strftime("%Y-%m-%d %H:%M")
+        fullname = override.student.profile.name
         data.append(dict(zip(
             header,
-            (module.student.username, fullname, extended_due))))
+            (override.student.username, fullname, due))))
     data.sort(key=lambda x: x[header[0]])
     return {
         "header": header,
@@ -288,23 +241,19 @@ def dump_student_extensions(course, student):
     data = []
     header = [_("Unit"), _("Extended Due Date")]
     units = get_units_with_due_date(course)
-    units = dict([(u.location, u) for u in units])
-    query = StudentModule.objects.filter(
+    units = {u.location: u for u in units}
+    query = StudentFieldOverride.objects.filter(
         course_id=course.id,
-        student_id=student.id)
-    for module in query:
-        state = json.loads(module.state)
-        # temporary hack: module_state_key is missing the run but units are not. fix module_state_key
-        module_loc = module.module_state_key.map_into_course(module.course_id)
-        if module_loc not in units:
+        student=student,
+        field='due')
+    for override in query:
+        location = override.location.replace(course_key=course.id)
+        if location not in units:
             continue
-        extended_due = state.get("extended_due")
-        if not extended_due:
-            continue
-        extended_due = DATE_FIELD.from_json(extended_due)
-        extended_due = extended_due.strftime("%Y-%m-%d %H:%M")
-        title = title_or_url(units[module_loc])
-        data.append(dict(zip(header, (title, extended_due))))
+        due = DATE_FIELD.from_json(json.loads(override.value))
+        due = due.strftime("%Y-%m-%d %H:%M")
+        title = title_or_url(units[location])
+        data.append(dict(zip(header, (title, due))))
     return {
         "header": header,
         "title": _("Due date extensions for {0} {1} ({2})").format(
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index a9221edf25..b3892c62a7 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -343,6 +343,10 @@ if FEATURES.get('ENABLE_CORS_HEADERS') or FEATURES.get('ENABLE_CROSS_DOMAIN_CSRF
     CROSS_DOMAIN_CSRF_COOKIE_DOMAIN = ENV_TOKENS.get('CROSS_DOMAIN_CSRF_COOKIE_DOMAIN')
 
 
+# Field overrides.  To use the IDDE feature, add
+# 'courseware.student_field_overrides.IndividualStudentOverrideProvider'.
+FIELD_OVERRIDE_PROVIDERS = tuple(ENV_TOKENS.get('FIELD_OVERRIDE_PROVIDERS', []))
+
 ############################## SECURE AUTH ITEMS ###############
 # Secret things: passwords, access keys, etc.
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 60283e9693..080e40baed 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -208,6 +208,10 @@ FEATURES = {
     'ENABLE_INSTRUCTOR_BACKGROUND_TASKS': True,
 
     # Enable instructor to assign individual due dates
+    # Note: In order for this feature to work, you must also add
+    # 'courseware.student_field_overrides.IndividualStudentOverrideProvider' to
+    # the setting FIELD_OVERRIDE_PROVIDERS, in addition to setting this flag to
+    # True.
     'INDIVIDUAL_DUE_DATES': False,
 
     # Enable legacy instructor dashboard
@@ -2225,3 +2229,9 @@ ECOMMERCE_API_TIMEOUT = 5
 
 # Reverification checkpoint name pattern
 CHECKPOINT_PATTERN = r'(?P<checkpoint_name>\w+)'
+
+# For the fields override feature
+# If using FEATURES['INDIVIDUAL_DUE_DATES'], you should add
+# 'courseware.student_field_overrides.IndividualStudentOverrideProvider' to
+# this setting.
+FIELD_OVERRIDE_PROVIDERS = ()

From a2cb7fd276c9200e1b2b1753cf9a51cffd7fece8 Mon Sep 17 00:00:00 2001
From: Chris Rossi <chris@archimedeanco.com>
Date: Thu, 13 Nov 2014 13:29:34 -0500
Subject: [PATCH 02/29] MIT: CCX. Implement Custom Courses for Edx.

This feature provides the ability to designate a "coach" who can create customized runs of an existing course, invite students to participate, and manage students through the run of the course.

In this squashed commit we implement the initial scifi, add the 'POC Coach' course role, refine the scifi, add migrations for models, create POCs, enforce POC Coach role, provide panels for Coach Dashboard, set up rudimentary display of course outline, add and remove units, show/hide all units, and save schedule changes, set dates when adding units, edit dates on units already added and provide some tests.

We also provide mechanisms for invitation and enrollment in a POC (to become CCX) and control the display of blocks to students in a POC.
---
 common/djangoapps/student/roles.py            |   8 +
 common/lib/xmodule/xmodule/tabs.py            |  26 +
 lms/djangoapps/courseware/module_render.py    |  11 +-
 lms/djangoapps/instructor/access.py           |   9 +-
 lms/djangoapps/instructor/views/api.py        |  18 +-
 lms/djangoapps/pocs/__init__.py               |   0
 .../pocs/migrations/0001_initial.py           | 116 ++++
 ...bership__add_field_pocmembership_active.py | 100 ++++
 lms/djangoapps/pocs/migrations/__init__.py    |   0
 lms/djangoapps/pocs/models.py                 |  44 ++
 lms/djangoapps/pocs/overrides.py              |  86 +++
 lms/djangoapps/pocs/tests/__init__.py         |   0
 lms/djangoapps/pocs/tests/test_overrides.py   | 112 ++++
 lms/djangoapps/pocs/tests/test_views.py       | 166 ++++++
 lms/djangoapps/pocs/utils.py                  | 213 ++++++++
 lms/djangoapps/pocs/views.py                  | 244 +++++++++
 lms/envs/common.py                            |   3 +
 lms/envs/test.py                              |   4 +-
 lms/static/sass/course.scss.mako              |   5 +-
 .../sass/course/poc_coach/_dashboard.scss     |  57 ++
 .../instructor_dashboard_2/membership.html    |  15 +-
 lms/templates/pocs/coach_dashboard.html       |  81 +++
 .../pocs/enroll_email_allowedmessage.txt      |  43 ++
 .../pocs/enroll_email_allowedsubject.txt      |   5 +
 .../pocs/enroll_email_enrolledmessage.txt     |  20 +
 .../pocs/enroll_email_enrolledsubject.txt     |   5 +
 lms/templates/pocs/enrollment.html            |  78 +++
 lms/templates/pocs/schedule.html              | 504 ++++++++++++++++++
 .../pocs/unenroll_email_allowedmessage.txt    |  13 +
 .../pocs/unenroll_email_enrolledmessage.txt   |  17 +
 lms/templates/pocs/unenroll_email_subject.txt |   5 +
 lms/urls.py                                   |   9 +
 32 files changed, 2003 insertions(+), 14 deletions(-)
 create mode 100644 lms/djangoapps/pocs/__init__.py
 create mode 100644 lms/djangoapps/pocs/migrations/0001_initial.py
 create mode 100644 lms/djangoapps/pocs/migrations/0002_auto__add_pocfuturemembership__add_field_pocmembership_active.py
 create mode 100644 lms/djangoapps/pocs/migrations/__init__.py
 create mode 100644 lms/djangoapps/pocs/models.py
 create mode 100644 lms/djangoapps/pocs/overrides.py
 create mode 100644 lms/djangoapps/pocs/tests/__init__.py
 create mode 100644 lms/djangoapps/pocs/tests/test_overrides.py
 create mode 100644 lms/djangoapps/pocs/tests/test_views.py
 create mode 100644 lms/djangoapps/pocs/utils.py
 create mode 100644 lms/djangoapps/pocs/views.py
 create mode 100644 lms/static/sass/course/poc_coach/_dashboard.scss
 create mode 100644 lms/templates/pocs/coach_dashboard.html
 create mode 100644 lms/templates/pocs/enroll_email_allowedmessage.txt
 create mode 100644 lms/templates/pocs/enroll_email_allowedsubject.txt
 create mode 100644 lms/templates/pocs/enroll_email_enrolledmessage.txt
 create mode 100644 lms/templates/pocs/enroll_email_enrolledsubject.txt
 create mode 100644 lms/templates/pocs/enrollment.html
 create mode 100644 lms/templates/pocs/schedule.html
 create mode 100644 lms/templates/pocs/unenroll_email_allowedmessage.txt
 create mode 100644 lms/templates/pocs/unenroll_email_enrolledmessage.txt
 create mode 100644 lms/templates/pocs/unenroll_email_subject.txt

diff --git a/common/djangoapps/student/roles.py b/common/djangoapps/student/roles.py
index c1b78748e4..c94789641f 100644
--- a/common/djangoapps/student/roles.py
+++ b/common/djangoapps/student/roles.py
@@ -267,6 +267,14 @@ class LibraryUserRole(CourseRole):
         super(LibraryUserRole, self).__init__(self.ROLE, *args, **kwargs)
 
 
+class CoursePocCoachRole(CourseRole):
+    """A POC Coach"""
+    ROLE = 'poc_coach'
+
+    def __init__(self, *args, **kwargs):
+        super(CoursePocCoachRole, self).__init__(self.ROLE, *args, **kwargs)
+
+
 class OrgStaffRole(OrgRole):
     """An organization staff member"""
     def __init__(self, *args, **kwargs):
diff --git a/common/lib/xmodule/xmodule/tabs.py b/common/lib/xmodule/xmodule/tabs.py
index d4b986d3b6..66285df67d 100644
--- a/common/lib/xmodule/xmodule/tabs.py
+++ b/common/lib/xmodule/xmodule/tabs.py
@@ -193,6 +193,7 @@ class CourseTab(object):
             'edxnotes': EdxNotesTab,
             'syllabus': SyllabusTab,
             'instructor': InstructorTab,  # not persisted
+            'poc_coach': PocCoachTab,  # not persisted
         }
 
         tab_type = tab_dict.get('type')
@@ -733,6 +734,28 @@ class InstructorTab(StaffTab):
         )
 
 
+class PocCoachTab(CourseTab):
+    """
+    A tab for the personal online course coaches.
+    """
+    type = 'poc_coach'
+
+    def __init__(self, tab_dict=None):  # pylint: disable=unused-argument
+        super(PocCoachTab, self).__init__(
+            name=_('POC Coach'),
+            tab_id=self.type,
+            link_func=link_reverse_func('poc_coach_dashboard'),
+        )
+
+    def can_display(self, course, settings, *args, **kw):
+        # TODO Check that user actually has 'poc_coach' role on course
+        #      this is difficult to do because the user isn't passed in.
+        #      We need either a hack or an architectural realignment.
+        return (
+            settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False) and
+            super(PocCoachTab, self).can_display(course, settings, *args, **kw))
+
+
 class CourseTabList(List):
     """
     An XBlock field class that encapsulates a collection of Tabs in a course.
@@ -833,6 +856,9 @@ class CourseTabList(List):
         instructor_tab = InstructorTab()
         if instructor_tab.can_display(course, settings, is_user_authenticated, is_user_staff, is_user_enrolled):
             yield instructor_tab
+        poc_coach_tab = PocCoachTab()
+        if poc_coach_tab.can_display(course, settings, is_user_authenticated, is_user_staff, is_user_enrolled):
+            yield poc_coach_tab
 
     @staticmethod
     def iterate_displayable_cms(
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 923827e84d..9e258988cb 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -681,7 +681,7 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
         if not has_access(user, 'load', descriptor, course_id):
             return None
 
-    (system, field_data) = get_module_system_for_user(
+    (system, student_data) = get_module_system_for_user(
         user=user,
         field_data_cache=field_data_cache,  # These have implicit user bindings, the rest of args are considered not to
         descriptor=descriptor,
@@ -699,6 +699,15 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
     authored_data = OverrideFieldData.wrap(user, descriptor._field_data)  # pylint: disable=protected-access
     descriptor.bind_for_student(system, LmsFieldData(authored_data, field_data), user.id)
     descriptor.scope_ids = descriptor.scope_ids._replace(user_id=user.id)  # pylint: disable=protected-access
+
+    # Do not check access when it's a noauth request.
+    # Not that the access check needs to happen after the descriptor is bound
+    # for the student, since there may be field override data for the student
+    # that affects xblock visibility.
+    if getattr(user, 'known', True):
+        if not has_access(user, 'load', descriptor, course_id):
+            return None
+
     return descriptor
 
 
diff --git a/lms/djangoapps/instructor/access.py b/lms/djangoapps/instructor/access.py
index 168814256e..d39fca0e1a 100644
--- a/lms/djangoapps/instructor/access.py
+++ b/lms/djangoapps/instructor/access.py
@@ -12,7 +12,13 @@ TO DO sync instructor and staff flags
 import logging
 from django_comment_common.models import Role
 
-from student.roles import CourseBetaTesterRole, CourseInstructorRole, CourseStaffRole
+from student.roles import (
+    CourseBetaTesterRole,
+    CourseInstructorRole,
+    CoursePocCoachRole,
+    CourseStaffRole,
+)
+
 
 log = logging.getLogger(__name__)
 
@@ -20,6 +26,7 @@ ROLES = {
     'beta': CourseBetaTesterRole,
     'instructor': CourseInstructorRole,
     'staff': CourseStaffRole,
+    'poc_coach': CoursePocCoachRole,
 }
 
 
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 1610a796c1..29d0a5a1d7 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -73,7 +73,7 @@ from instructor.enrollment import (
     send_beta_role_email,
     unenroll_email,
 )
-from instructor.access import list_with_level, allow_access, revoke_access, update_forum_role
+from instructor.access import list_with_level, allow_access, revoke_access, ROLES, update_forum_role
 from instructor.offline_gradecalc import student_grades
 import instructor_analytics.basic
 import instructor_analytics.distributions
@@ -679,7 +679,7 @@ def bulk_beta_modify_access(request, course_id):
 @common_exceptions_400
 @require_query_params(
     unique_student_identifier="email or username of user to change access",
-    rolename="'instructor', 'staff', or 'beta'",
+    rolename="'instructor', 'staff', 'beta', or 'poc_coach'",
     action="'allow' or 'revoke'"
 )
 def modify_access(request, course_id):
@@ -691,7 +691,7 @@ def modify_access(request, course_id):
 
     Query parameters:
     unique_student_identifer is the target user's username or email
-    rolename is one of ['instructor', 'staff', 'beta']
+    rolename is one of ['instructor', 'staff', 'beta', 'poc_coach']
     action is one of ['allow', 'revoke']
     """
     course_id = SlashSeparatedCourseKey.from_deprecated_string(course_id)
@@ -720,10 +720,10 @@ def modify_access(request, course_id):
     rolename = request.GET.get('rolename')
     action = request.GET.get('action')
 
-    if rolename not in ['instructor', 'staff', 'beta']:
-        return HttpResponseBadRequest(strip_tags(
-            "unknown rolename '{}'".format(rolename)
-        ))
+    if not rolename in ROLES:
+        error = strip_tags("unknown rolename '{}'".format(rolename))
+        log.error(error)
+        return HttpResponseBadRequest(error)
 
     # disallow instructors from removing their own instructor access.
     if rolename == 'instructor' and user == request.user and action != 'allow':
@@ -762,7 +762,7 @@ def list_course_role_members(request, course_id):
     List instructors and staff.
     Requires instructor access.
 
-    rolename is one of ['instructor', 'staff', 'beta']
+    rolename is one of ['instructor', 'staff', 'beta', 'poc_coach']
 
     Returns JSON of the form {
         "course_id": "some/course/id",
@@ -783,7 +783,7 @@ def list_course_role_members(request, course_id):
 
     rolename = request.GET.get('rolename')
 
-    if rolename not in ['instructor', 'staff', 'beta']:
+    if not rolename in ROLES:
         return HttpResponseBadRequest()
 
     def extract_user_info(user):
diff --git a/lms/djangoapps/pocs/__init__.py b/lms/djangoapps/pocs/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lms/djangoapps/pocs/migrations/0001_initial.py b/lms/djangoapps/pocs/migrations/0001_initial.py
new file mode 100644
index 0000000000..4572bf8991
--- /dev/null
+++ b/lms/djangoapps/pocs/migrations/0001_initial.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'PersonalOnlineCourse'
+        db.create_table('pocs_personalonlinecourse', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('course_id', self.gf('xmodule_django.models.CourseKeyField')(max_length=255, db_index=True)),
+            ('display_name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('coach', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+        ))
+        db.send_create_signal('pocs', ['PersonalOnlineCourse'])
+
+        # Adding model 'PocMembership'
+        db.create_table('pocs_pocmembership', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('poc', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['pocs.PersonalOnlineCourse'])),
+            ('student', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+        ))
+        db.send_create_signal('pocs', ['PocMembership'])
+
+        # Adding model 'PocFieldOverride'
+        db.create_table('pocs_pocfieldoverride', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('poc', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['pocs.PersonalOnlineCourse'])),
+            ('location', self.gf('xmodule_django.models.LocationKeyField')(max_length=255, db_index=True)),
+            ('field', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('value', self.gf('django.db.models.fields.TextField')(default='null')),
+        ))
+        db.send_create_signal('pocs', ['PocFieldOverride'])
+
+        # Adding unique constraint on 'PocFieldOverride', fields ['poc', 'location', 'field']
+        db.create_unique('pocs_pocfieldoverride', ['poc_id', 'location', 'field'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'PocFieldOverride', fields ['poc', 'location', 'field']
+        db.delete_unique('pocs_pocfieldoverride', ['poc_id', 'location', 'field'])
+
+        # Deleting model 'PersonalOnlineCourse'
+        db.delete_table('pocs_personalonlinecourse')
+
+        # Deleting model 'PocMembership'
+        db.delete_table('pocs_pocmembership')
+
+        # Deleting model 'PocFieldOverride'
+        db.delete_table('pocs_pocfieldoverride')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'pocs.personalonlinecourse': {
+            'Meta': {'object_name': 'PersonalOnlineCourse'},
+            'coach': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'pocs.pocfieldoverride': {
+            'Meta': {'unique_together': "(('poc', 'location', 'field'),)", 'object_name': 'PocFieldOverride'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'pocs.pocmembership': {
+            'Meta': {'object_name': 'PocMembership'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['pocs']
\ No newline at end of file
diff --git a/lms/djangoapps/pocs/migrations/0002_auto__add_pocfuturemembership__add_field_pocmembership_active.py b/lms/djangoapps/pocs/migrations/0002_auto__add_pocfuturemembership__add_field_pocmembership_active.py
new file mode 100644
index 0000000000..9e650b7526
--- /dev/null
+++ b/lms/djangoapps/pocs/migrations/0002_auto__add_pocfuturemembership__add_field_pocmembership_active.py
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'PocFutureMembership'
+        db.create_table('pocs_pocfuturemembership', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('poc', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['pocs.PersonalOnlineCourse'])),
+            ('email', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('pocs', ['PocFutureMembership'])
+
+        # Adding field 'PocMembership.active'
+        db.add_column('pocs_pocmembership', 'active',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting model 'PocFutureMembership'
+        db.delete_table('pocs_pocfuturemembership')
+
+        # Deleting field 'PocMembership.active'
+        db.delete_column('pocs_pocmembership', 'active')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'pocs.personalonlinecourse': {
+            'Meta': {'object_name': 'PersonalOnlineCourse'},
+            'coach': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'pocs.pocfieldoverride': {
+            'Meta': {'unique_together': "(('poc', 'location', 'field'),)", 'object_name': 'PocFieldOverride'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'pocs.pocfuturemembership': {
+            'Meta': {'object_name': 'PocFutureMembership'},
+            'email': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"})
+        },
+        'pocs.pocmembership': {
+            'Meta': {'object_name': 'PocMembership'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['pocs']
\ No newline at end of file
diff --git a/lms/djangoapps/pocs/migrations/__init__.py b/lms/djangoapps/pocs/migrations/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lms/djangoapps/pocs/models.py b/lms/djangoapps/pocs/models.py
new file mode 100644
index 0000000000..da06a9fc7b
--- /dev/null
+++ b/lms/djangoapps/pocs/models.py
@@ -0,0 +1,44 @@
+from django.contrib.auth.models import User
+from django.db import models
+
+from xmodule_django.models import CourseKeyField, LocationKeyField
+
+
+class PersonalOnlineCourse(models.Model):
+    """
+    A Personal Online Course.
+    """
+    course_id = CourseKeyField(max_length=255, db_index=True)
+    display_name = models.CharField(max_length=255)
+    coach = models.ForeignKey(User, db_index=True)
+
+
+class PocMembership(models.Model):
+    """
+    Which students are in a POC?
+    """
+    poc = models.ForeignKey(PersonalOnlineCourse, db_index=True)
+    student = models.ForeignKey(User, db_index=True)
+    active = models.BooleanField(default=False)
+
+
+class PocFutureMembership(models.Model):
+    """
+    Which emails for non-users are waiting to be added to POC on registration
+    """
+    poc = models.ForeignKey(PersonalOnlineCourse, db_index=True)
+    email = models.CharField(max_length=255)
+
+
+class PocFieldOverride(models.Model):
+    """
+    Field overrides for personal online courses.
+    """
+    poc = models.ForeignKey(PersonalOnlineCourse, db_index=True)
+    location = LocationKeyField(max_length=255, db_index=True)
+    field = models.CharField(max_length=255)
+
+    class Meta:
+        unique_together = (('poc', 'location', 'field'),)
+
+    value = models.TextField(default='null')
diff --git a/lms/djangoapps/pocs/overrides.py b/lms/djangoapps/pocs/overrides.py
new file mode 100644
index 0000000000..5af4d799c9
--- /dev/null
+++ b/lms/djangoapps/pocs/overrides.py
@@ -0,0 +1,86 @@
+"""
+API related to providing field overrides for individual students.  This is used
+by the individual due dates feature.
+"""
+import json
+
+from courseware.field_overrides import FieldOverrideProvider
+
+from .models import PocMembership, PocFieldOverride
+
+
+class PersonalOnlineCoursesOverrideProvider(FieldOverrideProvider):
+    """
+    A concrete implementation of
+    :class:`~courseware.field_overrides.FieldOverrideProvider` which allows for
+    overrides to be made on a per user basis.
+    """
+    def get(self, block, name, default):
+        poc = get_current_poc(self.user)
+        if poc:
+            return get_override_for_poc(poc, block, name, default)
+        return default
+
+
+def get_current_poc(user):
+    """
+    TODO Needs to look in user's session
+    """
+    # Temporary implementation.  Final implementation will need to look in
+    # user's session so user can switch between (potentially multiple) POC and
+    # MOOC views.  See courseware.courses.get_request_for_thread for idea to
+    # get at the request object.
+    try:
+        membership = PocMembership.objects.get(student=user, active=True)
+        return membership.poc
+    except PocMembership.DoesNotExist:
+        return None
+
+
+def get_override_for_poc(poc, block, name, default=None):
+    """
+    Gets the value of the overridden field for the `poc`.  `block` and `name`
+    specify the block and the name of the field.  If the field is not
+    overridden for the given poc, returns `default`.
+    """
+    try:
+        override = PocFieldOverride.objects.get(
+            poc=poc,
+            location=block.location,
+            field=name)
+        field = block.fields[name]
+        return field.from_json(json.loads(override.value))
+    except PocFieldOverride.DoesNotExist:
+        pass
+    return default
+
+
+def override_field_for_poc(poc, block, name, value):
+    """
+    Overrides a field for the `poc`.  `block` and `name` specify the block
+    and the name of the field on that block to override.  `value` is the
+    value to set for the given field.
+    """
+    override, created = PocFieldOverride.objects.get_or_create(
+        poc=poc,
+        location=block.location,
+        field=name)
+    field = block.fields[name]
+    override.value = json.dumps(field.to_json(value))
+    override.save()
+
+
+def clear_override_for_poc(poc, block, name):
+    """
+    Clears a previously set field override for the `poc`.  `block` and `name`
+    specify the block and the name of the field on that block to clear.
+    This function is idempotent--if no override is set, nothing action is
+    performed.
+    """
+    try:
+        PocFieldOverride.objects.get(
+            poc=poc,
+            location=block.location,
+            field=name).delete()
+    except PocFieldOverride.DoesNotExist:
+        pass
diff --git a/lms/djangoapps/pocs/tests/__init__.py b/lms/djangoapps/pocs/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lms/djangoapps/pocs/tests/test_overrides.py b/lms/djangoapps/pocs/tests/test_overrides.py
new file mode 100644
index 0000000000..4a8178768f
--- /dev/null
+++ b/lms/djangoapps/pocs/tests/test_overrides.py
@@ -0,0 +1,112 @@
+import datetime
+import mock
+import pytz
+
+from courseware.field_overrides import OverrideFieldData
+from django.test.utils import override_settings
+from student.tests.factories import AdminFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+
+from ..models import PersonalOnlineCourse
+from ..overrides import override_field_for_poc
+
+
+@override_settings(FIELD_OVERRIDE_PROVIDERS=(
+    'pocs.overrides.PersonalOnlineCoursesOverrideProvider',))
+class TestFieldOverrides(ModuleStoreTestCase):
+    """
+    Make sure field overrides behave in the expected manner.
+    """
+    def setUp(self):
+        """
+        Set up tests
+        """
+        self.course = course = CourseFactory.create()
+
+        # Create a course outline
+        self.mooc_start = start = datetime.datetime(
+            2010, 5, 12, 2, 42, tzinfo=pytz.UTC)
+        self.mooc_due = due = datetime.datetime(
+            2010, 7, 7, 0, 0, tzinfo=pytz.UTC)
+        chapters = [ItemFactory.create(start=start, parent=course)
+                    for _ in xrange(2)]
+        sequentials = flatten([
+            [ItemFactory.create(parent=chapter) for _ in xrange(2)]
+            for chapter in chapters])
+        verticals = flatten([
+            [ItemFactory.create(due=due, parent=sequential) for _ in xrange(2)]
+            for sequential in sequentials])
+        blocks = flatten([
+            [ItemFactory.create(parent=vertical) for _ in xrange(2)]
+            for vertical in verticals])
+
+        self.poc = poc = PersonalOnlineCourse(
+            course_id=course.id,
+            display_name='Test POC',
+            coach=AdminFactory.create())
+        poc.save()
+
+        patch = mock.patch('pocs.overrides.get_current_poc')
+        self.get_poc = get_poc = patch.start()
+        get_poc.return_value = poc
+        self.addCleanup(patch.stop)
+
+        # Apparently the test harness doesn't use LmsFieldStorage, and I'm not
+        # sure if there's a way to poke the test harness to do so.  So, we'll
+        # just inject the override field storage in this brute force manner.
+        OverrideFieldData.provider_classes = None
+        for block in iter_blocks(course):
+            block._field_data = OverrideFieldData.wrap(  # pylint: disable=protected-access
+                AdminFactory.create(), block._field_data)  # pylint: disable=protected-access
+
+    def test_override_start(self):
+        """
+        Test that overriding start date on a chapter works.
+        """
+        poc_start = datetime.datetime(2014, 12, 25, 00, 00, tzinfo=pytz.UTC)
+        chapter = self.course.get_children()[0]
+        override_field_for_poc(self.poc, chapter, 'start', poc_start)
+        self.assertEquals(chapter.start, poc_start)
+
+    def test_override_is_inherited(self):
+        """
+        Test that sequentials inherit overridden start date from chapter.
+        """
+        poc_start = datetime.datetime(2014, 12, 25, 00, 00, tzinfo=pytz.UTC)
+        chapter = self.course.get_children()[0]
+        override_field_for_poc(self.poc, chapter, 'start', poc_start)
+        self.assertEquals(chapter.get_children()[0].start, poc_start)
+        self.assertEquals(chapter.get_children()[1].start, poc_start)
+
+    def test_override_is_inherited_even_if_set_in_mooc(self):
+        """
+        Test that a due date set on a chapter is inherited by grandchildren
+        (verticals) even if a due date is set explicitly on grandchildren in
+        the mooc.
+        """
+        poc_due = datetime.datetime(2015, 1, 1, 00, 00, tzinfo=pytz.UTC)
+        chapter = self.course.get_children()[0]
+        chapter.display_name = 'itsme!'
+        override_field_for_poc(self.poc, chapter, 'due', poc_due)
+        vertical = chapter.get_children()[0].get_children()[0]
+        self.assertEqual(vertical.due, poc_due)
+
+
+def flatten(seq):
+    """
+    For [[1, 2], [3, 4]] returns [1, 2, 3, 4].  Does not recurse.
+    """
+    return [x for sub in seq for x in sub]
+
+
+def iter_blocks(course):
+    """
+    Returns an iterator over all of the blocks in a course.
+    """
+    def visit(block):
+        yield block
+        for child in block.get_children():
+            for descendant in visit(child):  # wish they'd backport yield from
+                yield descendant
+    return visit(course)
diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
new file mode 100644
index 0000000000..feaa83107f
--- /dev/null
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -0,0 +1,166 @@
+import datetime
+import json
+import re
+import pytz
+from mock import patch
+
+from courseware.tests.helpers import LoginEnrollmentTestCase
+from django.core.urlresolvers import reverse
+from edxmako.shortcuts import render_to_response
+from student.roles import CoursePocCoachRole
+from student.tests.factories import AdminFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+
+from ..models import PersonalOnlineCourse
+from ..overrides import get_override_for_poc
+
+
+def intercept_renderer(path, context):
+    """
+    Intercept calls to `render_to_response` and attach the context dict to the
+    response for examination in unit tests.
+    """
+    # I think Django already does this for you in their TestClient, except
+    # we're bypassing that by using edxmako.  Probably edxmako should be
+    # integrated better with Django's rendering and event system.
+    response = render_to_response(path, context)
+    response.mako_context = context
+    response.mako_template = path
+    return response
+
+
+class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
+    """
+    Tests for Personal Online Courses views.
+    """
+    def setUp(self):
+        """
+        Set up tests
+        """
+        self.course = course = CourseFactory.create()
+
+        # Create instructor account
+        self.coach = coach = AdminFactory.create()
+        self.client.login(username=coach.username, password="test")
+
+        # Create a course outline
+        self.mooc_start = start = datetime.datetime(
+            2010, 5, 12, 2, 42, tzinfo=pytz.UTC)
+        self.mooc_due = due = datetime.datetime(
+            2010, 7, 7, 0, 0, tzinfo=pytz.UTC)
+        chapters = [ItemFactory.create(start=start, parent=course)
+                    for _ in xrange(2)]
+        sequentials = flatten([
+            [ItemFactory.create(parent=chapter) for _ in xrange(2)]
+            for chapter in chapters])
+        verticals = flatten([
+            [ItemFactory.create(due=due, parent=sequential) for _ in xrange(2)]
+            for sequential in sequentials])
+        blocks = flatten([
+            [ItemFactory.create(parent=vertical) for _ in xrange(2)]
+            for vertical in verticals])
+
+    def make_coach(self):
+        role = CoursePocCoachRole(self.course.id)
+        role.add_users(self.coach)
+
+    def tearDown(self):
+        """
+        Undo patches.
+        """
+        patch.stopall()
+
+    def test_not_a_coach(self):
+        """
+        User is not a coach, should get Forbidden response.
+        """
+        url = reverse(
+            'poc_coach_dashboard',
+            kwargs={'course_id': self.course.id.to_deprecated_string()})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 403)
+
+    def test_no_poc_created(self):
+        """
+        No POC is created, coach should see form to add a POC.
+        """
+        self.make_coach()
+        url = reverse(
+            'poc_coach_dashboard',
+            kwargs={'course_id': self.course.id.to_deprecated_string()})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(re.search(
+            '<form action=".+create_poc"',
+            response.content))
+
+    def test_create_poc(self):
+        """
+        Create POC. Follow redirect to coach dashboard, confirm we see
+        the coach dashboard for the new POC.
+        """
+        self.make_coach()
+        url = reverse(
+            'create_poc',
+            kwargs={'course_id': self.course.id.to_deprecated_string()})
+        response = self.client.post(url, {'name': 'New POC'})
+        self.assertEqual(response.status_code, 302)
+        url = response.get('location')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(re.search('id="poc-schedule"', response.content))
+
+    @patch('pocs.views.render_to_response', intercept_renderer)
+    @patch('pocs.views.today')
+    def test_edit_schedule(self, today):
+        """
+        Get POC schedule, modify it, save it.
+        """
+        today.return_value = datetime.datetime(2014, 11, 25, tzinfo=pytz.UTC)
+        self.test_create_poc()
+        url = reverse(
+            'poc_coach_dashboard',
+            kwargs={'course_id': self.course.id.to_deprecated_string()})
+        response = self.client.get(url)
+        schedule = json.loads(response.mako_context['schedule'])
+        self.assertEqual(len(schedule), 2)
+        self.assertEqual(schedule[0]['hidden'], True)
+        self.assertEqual(schedule[0]['start'], None)
+        self.assertEqual(schedule[0]['children'][0]['start'], None)
+        self.assertEqual(schedule[0]['due'], None)
+        self.assertEqual(schedule[0]['children'][0]['due'], None)
+        self.assertEqual(
+            schedule[0]['children'][0]['children'][0]['due'], None
+        )
+
+        url = reverse(
+            'save_poc',
+            kwargs={'course_id': self.course.id.to_deprecated_string()})
+
+        schedule[0]['hidden'] = False
+        schedule[0]['start'] = u'2014-11-20 00:00'
+        schedule[0]['children'][0]['due'] = u'2014-12-25 00:00'  # what a jerk!
+        response = self.client.post(
+            url, json.dumps(schedule), content_type='application/json'
+        )
+
+        schedule = json.loads(response.content)
+        self.assertEqual(schedule[0]['hidden'], False)
+        self.assertEqual(schedule[0]['start'], u'2014-11-20 00:00')
+        self.assertEqual(
+            schedule[0]['children'][0]['due'], u'2014-12-25 00:00'
+        )
+
+        # Make sure start date set on course, follows start date of earliest
+        # scheduled chapter
+        poc = PersonalOnlineCourse.objects.get()
+        course_start = get_override_for_poc(poc, self.course, 'start')
+        self.assertEqual(str(course_start)[:-9], u'2014-11-20 00:00')
+
+
+def flatten(seq):
+    """
+    For [[1, 2], [3, 4]] returns [1, 2, 3, 4].  Does not recurse.
+    """
+    return [x for sub in seq for x in sub]
diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/pocs/utils.py
new file mode 100644
index 0000000000..6890bc18c6
--- /dev/null
+++ b/lms/djangoapps/pocs/utils.py
@@ -0,0 +1,213 @@
+"""
+POC Enrollment operations for use by Coach APIs.
+
+Does not include any access control, be sure to check access before calling.
+"""
+
+import json
+from django.contrib.auth.models import User
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from django.core.mail import send_mail
+
+from edxmako.shortcuts import render_to_string
+
+from microsite_configuration import microsite
+
+from pocs.models import (
+    PersonalOnlineCourse,
+    PocMembership,
+    PocFutureMembership,
+)
+
+
+class EmailEnrollmentState(object):
+    """ Store the complete enrollment state of an email in a class """
+    def __init__(self, poc, email):
+        exists_user = User.objects.filter(email=email).exists()
+        if exists_user:
+            user = User.objects.get(email=email)
+            poc_member = PocMembership.objects.filter(poc=poc, student=user)
+            in_poc = poc_member.exists()
+            full_name = user.profile.name
+        else:
+            in_poc = False
+            full_name = None
+        self.user = exists_user
+        self.member = user
+        self.full_name = full_name
+        self.in_poc = in_poc
+
+    def __repr__(self):
+        return "{}(user={}, member={}, in_poc={}".format(
+            self.__class__.__name__,
+            self.user,
+            self.member,
+            self.in_poc,
+        )
+
+    def to_dict(self):
+        return {
+            'user': self.user,
+            'member': self.member,
+            'in_poc': self.in_poc,
+        }
+
+
+def enroll_email(poc, student_email, auto_enroll=False, email_students=False, email_params=None):
+    if email_params is None:
+        email_params = get_email_params(poc, True)
+    previous_state = EmailEnrollmentState(poc, student_email)
+
+    if previous_state.user:
+        if not previous_state.in_poc:
+            user = User.objects.get(email=student_email)
+            membership = PocMembership(poc=poc, student=user)
+            membership.save()
+        if email_students:
+            email_params['message'] = 'enrolled_enroll'
+            email_params['email_address'] = student_email
+            email_params['full_name'] = previous_state.full_name
+            send_mail_to_student(student_email, email_params)
+    else:
+        membership = PocFutureMembership(poc=poc, email=student_email)
+        membership.save()
+        if email_students:
+            email_params['message'] = 'allowed_enroll'
+            email_params['email_address'] = student_email
+            send_mail_to_student(student_email, email_params)
+
+    after_state = EmailEnrollmentState(poc, student_email)
+
+    return previous_state, after_state
+
+
+def unenroll_email(poc, student_email, email_students=False, email_params=None):
+    if email_params is None:
+        email_params = get_email_params(poc, True)
+    previous_state = EmailEnrollmentState(poc, student_email)
+
+    if previous_state.in_poc:
+        PocMembership.objects.get(
+            poc=poc, student=previous_state.member
+        ).delete()
+        if email_students:
+            email_params['message'] = 'enrolled_unenroll'
+            email_params['email_address'] = student_email
+            email_params['full_name'] = previous_state.full_name
+            send_mail_to_student(student_email, email_params)
+    else:
+        if PocFutureMembership.objects.filter(
+            poc=poc, email=student_email
+        ).exists():
+            PocFutureMembership.get(poc=poc, email=student_email).delete()
+        if email_students:
+            email_params['message'] = 'allowed_unenroll'
+            email_params['email_address'] = student_email
+            send_mail_to_student(student_email, email_params)
+
+    after_state = EmailEnrollmentState(poc, student_email)
+
+    return previous_state, after_state
+
+
+def get_email_params(poc, auto_enroll, secure=True):
+    protocol = 'https' if secure else 'http'
+    course_id = poc.course_id
+
+    stripped_site_name = microsite.get_value(
+        'SITE_NAME',
+        settings.SITE_NAME
+    )
+    registration_url = u'{proto}://{site}{path}'.format(
+        proto=protocol,
+        site=stripped_site_name,
+        path=reverse('student.views.register_user')
+    )
+    course_url = u'{proto}://{site}{path}'.format(
+        proto=protocol,
+        site=stripped_site_name,
+        path=reverse(
+            'course_root',
+            kwargs={'course_id': course_id.to_deprecated_string()}
+        )
+    )
+
+    course_about_url = None
+    if not settings.FEATURES.get('ENABLE_MKTG_SITE', False):
+        course_about_url = u'{proto}://{site}{path}'.format(
+            proto=protocol,
+            site=stripped_site_name,
+            path=reverse(
+                'about_course',
+                kwargs={'course_id': course_id.to_deprecated_string()}
+            )
+        )
+
+    email_params = {
+        'site_name': stripped_site_name,
+        'registration_url': registration_url,
+        'course': poc,
+        'auto_enroll': auto_enroll,
+        'course_url': course_url,
+        'course_about_url': course_about_url,
+    }
+    return email_params
+
+
+def send_mail_to_student(student, param_dict):
+    if 'course' in param_dict:
+        param_dict['course_name'] = param_dict['course'].display_name
+
+    param_dict['site_name'] = microsite.get_value(
+        'SITE_NAME',
+        param_dict['site_name']
+    )
+
+    subject = None
+    message = None
+
+    message_type = param_dict['message']
+
+    email_template_dict = {
+        'allowed_enroll': (
+            'pocs/enroll_email_allowedsubject.txt',
+            'pocs/enroll_email_allowedmessage.txt'
+        ),
+        'enrolled_enroll': (
+            'pocs/enroll_email_enrolledsubject.txt',
+            'pocs/enroll_email_enrolledmessage.txt'
+        ),
+        'allowed_unenroll': (
+            'pocs/unenroll_email_subject.txt',
+            'pocs/unenroll_email_allowedmessage.txt'
+        ),
+        'enrolled_unenroll': (
+            'pocs/unenroll_email_subject.txt',
+            'pocs/unenroll_email_enrolledmessage.txt'
+        ),
+    }
+
+    subject_template, message_template = email_template_dict.get(
+        message_type, (None, None)
+    )
+    if subject_template is not None and message_template is not None:
+        subject = render_to_string(subject_template, param_dict)
+        message = render_to_string(message_template, param_dict)
+
+    if subject and message:
+        message = message.strip()
+
+        subject = ''.join(subject.splitlines())
+        from_address = microsite.get_value(
+            'email_from_address',
+            settings.DEFAULT_FROM_EMAIL
+        )
+
+        send_mail(
+            subject,
+            message,
+            from_address,
+            [student],
+            fail_silently=False
+        )
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
new file mode 100644
index 0000000000..89c53f4e2f
--- /dev/null
+++ b/lms/djangoapps/pocs/views.py
@@ -0,0 +1,244 @@
+import datetime
+import functools
+import json
+import logging
+import pytz
+
+from django.core.urlresolvers import reverse
+from django.http import HttpResponse, HttpResponseForbidden
+from django.core.exceptions import ValidationError
+from django.core.validators import validate_email
+from django.shortcuts import redirect
+from django.utils.translation import ugettext as _
+from django.views.decorators.cache import cache_control
+from django_future.csrf import ensure_csrf_cookie
+from django.contrib.auth.models import User
+
+from courseware.courses import get_course_by_id
+from courseware.field_overrides import disable_overrides
+from edxmako.shortcuts import render_to_response
+from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from student.roles import CoursePocCoachRole
+
+from instructor.views.api import _split_input_list
+from instructor.views.tools import get_student_from_identifier
+
+from .models import PersonalOnlineCourse, PocMembership
+from .overrides import (
+    clear_override_for_poc,
+    get_override_for_poc,
+    override_field_for_poc,
+)
+from .utils import enroll_email, unenroll_email
+
+log = logging.getLogger(__name__)
+today = datetime.datetime.today  # for patching in tests
+
+
+def coach_dashboard(view):
+    """
+    View decorator which enforces that the user have the POC coach role on the
+    given course and goes ahead and translates the course_id from the Django
+    route into a course object.
+    """
+    @functools.wraps(view)
+    def wrapper(request, course_id):
+        course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
+        role = CoursePocCoachRole(course_key)
+        if not role.has_user(request.user):
+            return HttpResponseForbidden(
+                _('You must be a POC Coach to access this view.'))
+        course = get_course_by_id(course_key, depth=None)
+        return view(request, course)
+    return wrapper
+
+
+@ensure_csrf_cookie
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@coach_dashboard
+def dashboard(request, course):
+    """
+    Display the POC Coach Dashboard.
+    """
+    poc = get_poc_for_coach(course, request.user)
+    schedule = get_poc_schedule(course, poc)
+    context = {
+        'course': course,
+        'poc': poc,
+        'schedule': json.dumps(schedule, indent=4),
+        'save_url': reverse('save_poc', kwargs={'course_id': course.id}),
+        'poc_members': PocMembership.objects.filter(poc=poc),
+    }
+    if not poc:
+        context['create_poc_url'] = reverse(
+            'create_poc', kwargs={'course_id': course.id})
+    return render_to_response('pocs/coach_dashboard.html', context)
+
+
+@ensure_csrf_cookie
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@coach_dashboard
+def create_poc(request, course):
+    """
+    Create a new POC
+    """
+    name = request.POST.get('name')
+    poc = PersonalOnlineCourse(
+        course_id=course.id,
+        coach=request.user,
+        display_name=name)
+    poc.save()
+
+    # Make sure start/due are overridden for entire course
+    start = today().replace(tzinfo=pytz.UTC)
+    override_field_for_poc(poc, course, 'start', start)
+    override_field_for_poc(poc, course, 'due', None)
+
+    # Hide anything that can show up in the schedule
+    hidden = 'visible_to_staff_only'
+    for chapter in course.get_children():
+        override_field_for_poc(poc, chapter, hidden, True)
+        for sequential in chapter.get_children():
+            override_field_for_poc(poc, sequential, hidden, True)
+            for vertical in sequential.get_children():
+                override_field_for_poc(poc, vertical, hidden, True)
+
+    url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
+    return redirect(url)
+
+
+@ensure_csrf_cookie
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@coach_dashboard
+def save_poc(request, course):
+    """
+    Save changes to POC
+    """
+    poc = get_poc_for_coach(course, request.user)
+
+    def override_fields(parent, data, earliest=None):
+        blocks = {
+            str(child.location): child
+            for child in parent.get_children()}
+        for unit in data:
+            block = blocks[unit['location']]
+            override_field_for_poc(
+                poc, block, 'visible_to_staff_only', unit['hidden'])
+            start = parse_date(unit['start'])
+            if start:
+                if not earliest or start < earliest:
+                    earliest = start
+                override_field_for_poc(poc, block, 'start', start)
+            else:
+                clear_override_for_poc(poc, block, 'start')
+            due = parse_date(unit['due'])
+            if due:
+                override_field_for_poc(poc, block, 'due', due)
+            else:
+                clear_override_for_poc(poc, block, 'due')
+
+            children = unit.get('children', None)
+            if children:
+                override_fields(block, children, earliest)
+        return earliest
+
+    earliest = override_fields(course, json.loads(request.body))
+    if earliest:
+        override_field_for_poc(poc, course, 'start', earliest)
+
+    return HttpResponse(
+        json.dumps(get_poc_schedule(course, poc)),
+        content_type='application/json')
+
+
+def parse_date(s):
+    if s:
+        try:
+            date, time = s.split(' ')
+            year, month, day = map(int, date.split('-'))
+            hour, minute = map(int, time.split(':'))
+            return datetime.datetime(
+                year, month, day, hour, minute, tzinfo=pytz.UTC)
+        except:
+            log.warn("Unable to parse date: " + s)
+
+    return None
+
+
+def get_poc_for_coach(course, coach):
+    """
+    Looks to see if user is coach of a POC for this course.  Returns the POC or
+    None.
+    """
+    try:
+        return PersonalOnlineCourse.objects.get(
+            course_id=course.id,
+            coach=coach)
+    except PersonalOnlineCourse.DoesNotExist:
+        return None
+
+
+def get_poc_schedule(course, poc):
+    """
+    """
+    def visit(node, depth=1):
+        for child in node.get_children():
+            start = get_override_for_poc(poc, child, 'start', None)
+            if start:
+                start = str(start)[:-9]
+            due = get_override_for_poc(poc, child, 'due', None)
+            if due:
+                due = str(due)[:-9]
+            hidden = get_override_for_poc(
+                poc, child, 'visible_to_staff_only',
+                child.visible_to_staff_only)
+            visited = {
+                'location': str(child.location),
+                'display_name': child.display_name,
+                'category': child.category,
+                'start': start,
+                'due': due,
+                'hidden': hidden,
+            }
+            if depth < 3:
+                children = tuple(visit(child, depth + 1))
+                if children:
+                    visited['children'] = children
+                    yield visited
+            else:
+                yield visited
+
+    with disable_overrides():
+        return tuple(visit(course))
+
+
+@ensure_csrf_cookie
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@coach_dashboard
+def poc_invite(request, course):
+    """
+    Invite users to new poc
+    """
+    poc = get_poc_for_coach(course, request.user)
+    action = request.POST.get('enrollment-button')
+    identifiers_raw = request.POST.get('student-ids')
+    identifiers = _split_input_list(identifiers_raw)
+    for identifier in identifiers:
+        user = None
+        email = None
+        try:
+            user = get_student_from_identifier(identifier)
+        except User.DoesNotExist:
+            email = identifier
+        else:
+            email = user.email
+        try:
+            validate_email(email)
+            if action == 'Enroll':
+                enroll_email(poc, email, email_students=True)
+            if action == "Unenroll":
+                unenroll_email(poc, email, email_students=True)
+        except ValidationError:
+            pass  # maybe log this?
+    url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
+    return redirect(url)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 080e40baed..36271ee723 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -214,6 +214,9 @@ FEATURES = {
     # True.
     'INDIVIDUAL_DUE_DATES': False,
 
+    # Enable Personal Online Courses
+    'PERSONAL_ONLINE_COURSES': False,
+
     # Enable legacy instructor dashboard
     'ENABLE_INSTRUCTOR_LEGACY_DASHBOARD': True,
 
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 4204496988..35d1c5285c 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -445,7 +445,6 @@ MONGODB_LOG = {
     'db': 'xlog',
 }
 
-
 # Enable EdxNotes for tests.
 FEATURES['ENABLE_EDXNOTES'] = True
 
@@ -469,3 +468,6 @@ FACEBOOK_API_VERSION = "v2.2"
 
 # Certificates Views
 FEATURES['CERTIFICATES_HTML_VIEW'] = True
+
+######### personal online courses #########
+INSTALLED_APPS += ('pocs',)
diff --git a/lms/static/sass/course.scss.mako b/lms/static/sass/course.scss.mako
index 1151a55aa1..d401e5786f 100644
--- a/lms/static/sass/course.scss.mako
+++ b/lms/static/sass/course.scss.mako
@@ -77,5 +77,8 @@
 @import "course/instructor/email";
 @import "xmodule/descriptors/css/module-styles.scss";
 
-// course - discussion
+// course - poc_coach
+@import "course/poc_coach/dashboard";
+
+// discussion
 @import "course/discussion/form-wmd-toolbar";
diff --git a/lms/static/sass/course/poc_coach/_dashboard.scss b/lms/static/sass/course/poc_coach/_dashboard.scss
new file mode 100644
index 0000000000..e6bebb5e7a
--- /dev/null
+++ b/lms/static/sass/course/poc_coach/_dashboard.scss
@@ -0,0 +1,57 @@
+.poc-schedule-container {
+    float: left;
+    width: 750px;
+}
+
+table.poc-schedule {
+    width: 100%;
+
+    thead {
+        border-bottom: 2px solid black;
+    }
+    th:first-child {
+        width: 40%;
+    }
+    th:last-child {
+        width: 18%;
+    }
+    th, td {
+        padding: 10px;
+    }
+    .sequential .unit {
+        padding-left: 25px;
+    }
+    .vertical .unit {
+        padding-left: 40px;
+    }
+    a.empty {
+        display: block;
+        width: 100%;
+        color: white;
+    }
+    a.empty:hover {
+        color: #cbcbcb;
+    }
+}
+
+.poc-schedule-sidebar {
+    float: left;
+    width: 295px;
+    margin-left: 20px;
+}
+
+.poc-sidebar-panel {
+    border: 1px solid #cbcbcb;
+    padding: 15px;
+    margin-bottom: 20px;
+}
+
+form.poc-form {
+    line-height: 1.5;
+    select {
+        width: 100%;
+    }
+    .field {
+        margin: 5px 0 5px 0;
+    }
+}
diff --git a/lms/templates/instructor/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html
index d7ef87af5d..489211d9ee 100644
--- a/lms/templates/instructor/instructor_dashboard_2/membership.html
+++ b/lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -243,5 +243,18 @@
       data-add-button-label="${_("Add Community TA")}"
     ></div>
   %endif
-
+  
+  %if section_data['access']['instructor'] and settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
+    <div class="auth-list-container"
+      data-rolename="poc_coach"
+      data-display-name="${_("POC Coaches")}"
+      data-info-text="
+        ${_("POC Coaches are able to create their own Personal Online Courses "
+            "based on this course, which they can use to provide personalized "
+            "instruction to their own students based in this course material.")}"
+      data-list-endpoint="${section_data['list_course_role_members_url']}"
+      data-modify-endpoint="${section_data['modify_access_url']}"
+      data-add-button-label="${_("Add POC Coach")}"
+    ></div>
+  %endif
 </div>
diff --git a/lms/templates/pocs/coach_dashboard.html b/lms/templates/pocs/coach_dashboard.html
new file mode 100644
index 0000000000..3ad742619d
--- /dev/null
+++ b/lms/templates/pocs/coach_dashboard.html
@@ -0,0 +1,81 @@
+<%! from django.utils.translation import ugettext as _ %>
+<%! from django.core.urlresolvers import reverse %>
+
+<%inherit file="/main.html" />
+<%namespace name='static' file='/static_content.html'/>
+
+<%block name="pagetitle">${_("POC Coach Dashboard")}</%block>
+<%block name="nav_skip">#poc-coach-dashboard-content</%block>
+
+<%block name="headextra">
+  <%static:css group='style-course-vendor'/>
+  <%static:css group='style-vendor-tinymce-content'/>
+  <%static:css group='style-vendor-tinymce-skin'/>
+  <%static:css group='style-course'/>
+</%block>
+
+<%include file="/courseware/course_navigation.html" args="active_page='poc_coach'" />
+
+<section class="container">
+  <div class="instructor-dashboard-wrapper-2">
+    <section class="instructor-dashboard-content-2" id="poc-coach-dashboard-content">
+      <h1>${_("POC Coach Dashboard")}</h1>
+
+      %if not poc:
+      <section>
+        <form action="${create_poc_url}" method="POST">
+          <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
+          <input name="name" placeholder="Name your POC"/><br/>
+          <button id="create-poc">Coach a new Personal Online Course</button>
+        </form>
+      </section>
+      %endif
+      
+      %if poc:
+      <ul class="instructor-nav">
+        <li class="nav-item">
+          <a href="#" data-section="membership">${_("Enrollment")}</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" data-section="schedule">${_("Schedule")}</a>
+        </li>
+      </ul>
+      <section id="membership" class="idash-section">
+        <%include file="enrollment.html" args="" />
+      </section>
+      <section id="schedule" class="idash-section">
+        <%include file="schedule.html" args="" />
+      </section>
+      %endif
+
+    </section>
+  </div>
+</section>
+
+<script>
+  function setup_tabs() {
+    $(".instructor-nav a").on("click", function(event) {
+        event.preventDefault();
+        $(".instructor-nav a").removeClass("active-section");
+        var section_sel = "#" + $(this).attr("data-section");
+        $("section.idash-section").hide();
+        $(section_sel).show();
+        $(this).addClass("active-section");
+    });
+
+    var url = document.URL,
+        hashbang = url.indexOf('#!');
+    if (hashbang != -1) {
+      var selector = '.instructor-nav a[data-section=' + 
+        url.substr(hashbang + 2) + ']';
+      $(selector).click();
+    }
+    else {
+      $(".instructor-nav a").first().click();
+    }
+  }
+
+  $(setup_tabs);
+
+
+</script>
diff --git a/lms/templates/pocs/enroll_email_allowedmessage.txt b/lms/templates/pocs/enroll_email_allowedmessage.txt
new file mode 100644
index 0000000000..4315b038d0
--- /dev/null
+++ b/lms/templates/pocs/enroll_email_allowedmessage.txt
@@ -0,0 +1,43 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+${_("Dear student,")}
+
+${_("You have been invited to join {course_name} at {site_name} by a "
+	"member of the course staff.").format(
+		course_name=course.display_name,
+		site_name=site_name
+	)}
+% if is_shib_course:
+% if auto_enroll:
+
+${_("To access the course visit {course_url} and login.").format(course_url=course_url)}
+% elif course_about_url is not None:
+
+${_("To access the course visit {course_about_url} and register for the course.").format(
+		course_about_url=course_about_url)}
+% endif
+% else:
+
+${_("To finish your registration, please visit {registration_url} and fill "
+	"out the registration form making sure to use {email_address} in the E-mail field.").format(
+		registration_url=registration_url,
+		email_address=email_address
+	)}
+% if auto_enroll:
+${_("Once you have registered and activated your account, you will see "
+	"{course_name} listed on your dashboard.").format(
+		course_name=course.display_name
+	)}
+% elif course_about_url is not None:
+${_("Once you have registered and activated your account, visit {course_about_url} "
+	"to join the course.").format(course_about_url=course_about_url)}
+% else:
+${_("You can then enroll in {course_name}.").format(course_name=course.display_name)}
+% endif
+% endif
+
+----
+${_("This email was automatically sent from {site_name} to "
+	"{email_address}").format(
+		site_name=site_name, email_address=email_address
+	)}
diff --git a/lms/templates/pocs/enroll_email_allowedsubject.txt b/lms/templates/pocs/enroll_email_allowedsubject.txt
new file mode 100644
index 0000000000..0a39036140
--- /dev/null
+++ b/lms/templates/pocs/enroll_email_allowedsubject.txt
@@ -0,0 +1,5 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+${_("You have been invited to register for {course_name}").format(
+		course_name=course.display_name
+	)}
diff --git a/lms/templates/pocs/enroll_email_enrolledmessage.txt b/lms/templates/pocs/enroll_email_enrolledmessage.txt
new file mode 100644
index 0000000000..b24f5a4a36
--- /dev/null
+++ b/lms/templates/pocs/enroll_email_enrolledmessage.txt
@@ -0,0 +1,20 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+${_("Dear {full_name}").format(full_name=full_name)}
+
+${_("You have been enrolled in {course_name} at {site_name} by a member "
+	"of the course staff. The course should now appear on your {site_name} "
+	"dashboard.").format(
+		course_name=course.display_name,
+		site_name=site_name
+	)}
+
+${_("To start accessing course materials, please visit {course_url}").format(
+		course_url=course_url
+	)}
+
+----
+${_("This email was automatically sent from {site_name} to "
+	"{full_name}").format(
+		site_name=site_name, full_name=full_name
+	)}
diff --git a/lms/templates/pocs/enroll_email_enrolledsubject.txt b/lms/templates/pocs/enroll_email_enrolledsubject.txt
new file mode 100644
index 0000000000..dc84c3f0a8
--- /dev/null
+++ b/lms/templates/pocs/enroll_email_enrolledsubject.txt
@@ -0,0 +1,5 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+${_("You have been enrolled in {course_name}").format(
+		course_name=course.display_name
+	)}
diff --git a/lms/templates/pocs/enrollment.html b/lms/templates/pocs/enrollment.html
new file mode 100644
index 0000000000..01071f7116
--- /dev/null
+++ b/lms/templates/pocs/enrollment.html
@@ -0,0 +1,78 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+<div class="batch-enrollment" style="float:left;width:50%">
+  <form method="POST" action="poc_invite">
+  <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
+  <h2> ${_("Batch Enrollment")} </h2>
+  <p>
+    <label for="student-ids">
+      ${_("Enter email addresses and/or usernames separated by new lines or commas.")}
+      ${_("You will not get notification for emails that bounce, so please double-check spelling.")} </label>
+    <textarea rows="6" name="student-ids" placeholder="${_("Email Addresses/Usernames")}" spellcheck="false"></textarea>
+  </p>
+
+  <div class="enroll-option">
+    <input type="checkbox" name="auto-enroll" value="Auto-Enroll" checked="yes">
+    <label style="display:inline" for="auto-enroll">${_("Auto Enroll")}</label>
+    <div class="hint auto-enroll-hint">
+      <span class="hint-caret"></span>
+      <p>
+	${_("If this option is <em>checked</em>, users who have not yet registered for {platform_name} will be automatically enrolled.").format(platform_name=settings.PLATFORM_NAME)}
+	${_("If this option is left <em>unchecked</em>, users who have not yet registered for {platform_name} will not be enrolled, but will be allowed to enroll once they make an account.").format(platform_name=settings.PLATFORM_NAME)}
+	<br /><br />
+	${_("Checking this box has no effect if 'Unenroll' is selected.")}
+      </p>
+    </div>
+  </div>
+
+  <div class="enroll-option">
+    <input type="checkbox" name="email-students" value="Notify-students-by-email" checked="yes">
+    <label style="display:inline" for="email-students">${_("Notify users by email")}</label>
+    <div class="hint email-students-hint">
+      <span class="hint-caret"></span>
+      <p>
+	${_("If this option is <em>checked</em>, users will receive an email notification.")}
+      </p>
+    </div>
+  </div>
+
+  <div>
+    <input type="submit" name="enrollment-button" class="enrollment-button" value="${_("Enroll")}">
+    <input type="submit" name="enrollment-button" class="enrollment-button" value="${_("Unenroll")}">
+  </div>
+  <div class="request-response"></div>
+  <div class="request-response-error"></div>
+  </form>
+</div>
+
+<div class="member-lists-management" style="float:left;width:50%">
+  <div class="auth-list-container active">
+    <div class="member-list-widget">
+      <div class="member-list">
+        <h2> ${_("Student List Management")}</h2>
+        <table>
+          <thead>
+            <tr>
+              <td class="label">Username</td>
+              <td class="label">Email</td>
+              <td class="label">Revoke access</td>
+            </tr>
+          </thead>
+          <tbody>
+            %for member in poc_members:
+            <tr>
+              <td>${member.student}</td>
+              <td>${member.student.email}</td>
+              <td><div class="revoke"><i class="icon-remove-sign"></i> Revoke access</div></td>
+            </tr>
+            %endfor
+          </tbody>
+        </table>
+      </div>
+      <div class="bottom-bar">
+        <input name="add-field" class="add-field" placeholder="Enter username or email" type="text">
+        <input name="add" class="add" value="Add Student" type="button">
+      </div>
+    </div>
+  </div>
+</div> 
diff --git a/lms/templates/pocs/schedule.html b/lms/templates/pocs/schedule.html
new file mode 100644
index 0000000000..330070f085
--- /dev/null
+++ b/lms/templates/pocs/schedule.html
@@ -0,0 +1,504 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+<script id="poc-schedule-template" type="text/x-handlerbars-template">
+  <table class="poc-schedule">
+    <thead>
+      <tr>
+        <th>${_('Unit')}</th>
+        <th>${_('Start Date')}</th>
+        <th>${_('Due Date')}</th>
+        <th><a href="#" id="remove-all">
+          <i class="icon-remove-sign icon"></i> ${_('remove all')}
+        </a></th>
+      </tr>
+    </thead>
+    <tbody>
+      {{#each chapters}}
+        <tr class="chapter collapsed" data-location="{{location}}" data-depth="1">
+          <td class="unit">
+            <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a> 
+            {{display_name}}
+          </td>
+          <td class="date start-date"><a>{{start}}</a></td>
+          <td class="date due-date"><a>{{due}}</a></td>
+          <td><a href="#" class="remove-unit">
+            <i class="icon-remove-sign icon"></i> ${_('remove')}
+          </a></td>
+        </tr>
+        {{#each children}}
+          <tr class="sequential collapsed" data-depth="2" 
+              data-location="{{../location}} {{location}}">
+            <td class="unit">
+              <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a> 
+              {{display_name}}
+            </td>
+            <td class="date start-date"><a>{{start}}</a></td>
+            <td class="date due-date"><a>{{due}}</a></td>
+            <td><a href="#" class="remove-unit">
+              <i class="icon-remove-sign icon"></i> ${_('remove')}
+            </a></td>
+          </tr>
+          {{#each children}}
+            <tr class="vertical" data-dapth="3"
+                data-location="{{../../location}} {{../location}} {{location}}">
+              <td class="unit">&nbsp;{{display_name}}</td>
+              <td class="date start-date"><a>{{start}}</a></td>
+              <td class="date due-date"><a>{{due}}</a></td>
+              <td><a href="#" class="remove-unit">
+                <i class="icon-remove-sign icon"></i> ${_('remove')}
+              </a></td>
+          {{/each}}
+        {{/each}}
+      {{/each}}
+    </tbody>
+  </table>
+</script>
+
+<div class="poc-schedule-container">
+  <div id="poc-schedule"></div>
+</div>
+
+<section id="enter-date-modal" class="modal" aria-hidden="true">
+  <div class="inner-wrapper" role="dialog">
+    <button class="close-modal">
+      <i class="icon-remove"></i>
+      <span class="sr">
+        ${_("Close")}
+      </span>
+    </button>
+    <header>
+      <h2></h2>
+    </header>
+    <form role="form">
+      <div class="field">
+        <label></label>
+        <input type="date" name="date"/>
+        <input type="time" name="time"/>
+      </div>
+      <div class="field">
+        <button type="submit" class="btn btn-primary">${_('Set date')}</button>
+      </div>
+    </form>
+  </div>
+</section>
+
+<div class="poc-schedule-sidebar">
+  <div class="poc-sidebar-panel" id="dirty-schedule">
+    <h2>${_('Save changes')}</h2>
+    <form role="form">
+      <p>${_("You have unsaved changes.")}</p>
+      <div class="field">
+        <br/>
+        <button id="save-changes">${_("Save changes")}</button>
+      </div>
+    </form>
+  </div>
+  <div class="poc-sidebar-panel" id="ajax-error">
+    <h2>${_('Error')}</h2>
+    <p>${_("There was an error saving changes.")}</p>
+  </div>
+  <div class="poc-sidebar-panel">
+    <h2>${_('Schedule a Unit')}</h2>
+    <form role="form" id="add-unit" name="add-unit" class="poc-form">
+      <div class="field">
+        <b>${_('Chapter')}</b><br/>
+        <select name="chapter"></select>
+      </div>
+      <div class="field">
+        <b>${_('Sequential')}</b><br/>
+        <select name="sequential"></select>
+      </div>
+      <div class="field">
+        <b>${_('Vertical')}</b><br/>
+        <select name="vertical"></select>
+      </div>
+      <div class="field">
+        <b>${_('Start Date')}</b><br/>
+        <input type="date" name="start_date"/>
+        <input type="time" name="start_time"/>
+      </div>
+      <div class="field">
+        <b>${_('Due Date')}</b> ${_('(Optional)')}<br/>
+        <input type="date" name="due_date"/>
+        <input type="time" name="due_time"/>
+      </div>
+      <div class="field">
+        <br/>
+        <button id="add-unit-button">${_('Add Unit')}</button>
+      </div>
+      <div class="field">
+        <br/>
+        <button id="add-all">${_('Add All Units')}</button>
+      </div>
+    </form>
+    <div id="all-units-added">
+      ${_("All units have been added.")}
+    </div>
+  </div>
+</div>
+
+<script>
+var poc_schedule = (function () {
+  var save_url = '${save_url}';
+  var schedule = ${schedule};
+  var template = Handlebars.compile($('#poc-schedule-template').html());
+  var chapter_select = $('form#add-unit select[name="chapter"]'),
+      sequential_select = $('form#add-unit select[name="sequential"]'),
+      vertical_select = $('form#add-unit select[name="vertical"]');
+
+  var self = {
+    schedule: schedule,
+    dirty: false
+  };
+
+  function hide(unit) {
+    unit.hidden = true;
+  }
+
+  function show(unit) {
+    unit.hidden = false;
+  }
+
+  function get_datetime(which) {
+    var date = $('form#add-unit input[name=' + which + '_date]').val();
+    var time = $('form#add-unit input[name=' + which + '_time]').val();
+    if (date && time)
+      return date + ' ' + time;
+    return null;
+  }
+
+  function set_datetime(which, value) {
+    var parts = value ? value.split(' ') : ['', ''],
+        date = parts[0],
+        time = parts[1];
+    $('form#add-unit input[name=' + which + '_date]').val(date);
+    $('form#add-unit input[name=' + which + '_time]').val(time);
+  }
+
+  /**
+   * Render the course tree view.
+   */
+  self.render = function() {
+    this.hidden = pruned(this.schedule, function(node) {
+      return node.hidden || node.category !== 'vertical'});
+    this.showing = pruned(this.schedule, function(node) {
+      return !node.hidden});
+
+    // Render template
+    $('#poc-schedule').html(template({chapters: this.showing}));
+
+    // Start collapsed
+    $('table.poc-schedule .sequential,.vertical').hide();
+
+    // Click handlers for collapsible tree
+    $('table.poc-schedule .toggle-collapse').on('click', toggle_collapse);
+
+    // Hidden hover fields for empty date fields
+    $('table.poc-schedule .date a').each(function() {
+      if (! $(this).text()) {
+        $(this).text('Set date').addClass('empty');
+      }
+    });
+    
+    // Handle date edit clicks
+    $('table.poc-schedule .date a').attr('href', '#enter-date-modal')
+      .leanModal({closeButton: '.close-modal'});
+    $('table.poc-schedule .due-date a').on('click', enterNewDate('due'));
+    $('table.poc-schedule .start-date a').on('click', enterNewDate('start'));
+
+    // Click handler for remove all
+    $('table.poc-schedule a#remove-all').on('click', function(event) {
+      event.preventDefault();
+      schedule_apply(self.schedule, hide);
+      self.dirty = true;
+      self.render();
+    });
+
+    // Show or hide form
+    if (this.hidden.length) {
+      // Populate chapters select, depopulate others
+      chapter_select.html('')
+        .append('<option value="none">${_("Select a chapter")}...</option>')
+        .append(schedule_options(this.hidden));
+      sequential_select.html('').prop('disabled', true);
+      vertical_select.html('').prop('disabled', true);
+      $('form#add-unit').show();
+      $('#all-units-added').hide();
+      $('#add-unit-button').prop('disabled', true);
+    }
+    else {
+      $('form#add-unit').hide();
+      $('#all-units-added').show();
+    }
+
+    // Add unit handlers
+    chapter_select.on('change', function(event) {
+      var chapter_location = chapter_select.val();
+      vertical_select.html('').prop('disabled', true);
+      if (chapter_location !== 'none') {
+        chapter = find_unit(self.hidden, chapter_location);
+        sequential_select.html('')
+          .append('<option value="all">${_("All sequentials")}</option>')
+          .append(schedule_options(chapter.children));
+        sequential_select.prop('disabled', false);
+        $('#add-unit-button').prop('disabled', false);
+        set_datetime('start', chapter.start);
+        set_datetime('due', chapter.due);
+      }
+      else {
+        sequential_select.html('').prop('disabled', true);
+      }
+    });
+
+    sequential_select.on('change', function(event) {
+      var sequential_location = sequential_select.val();
+      if (sequential_location !== 'all') {
+        var chapter = chapter_select.val();
+        sequential = find_unit(self.hidden, chapter, sequential_location);
+        vertical_select.html('')
+          .append('<option value="all">${_("All verticals")}</option>')
+          .append(schedule_options(sequential.children));
+        vertical_select.prop('disabled', false);
+        set_datetime('start', sequential.start);
+        set_datetime('due', sequential.due);
+      }
+      else {
+        vertical_select.html('').prop('disabled', true);
+      } 
+    });
+    
+    vertical_select.on('change', function(event) {
+      var vertical_location = vertical_select.val();
+      if (vertical_location !== 'all') {
+        var chapter = chapter_select.val(),
+            sequential = sequential_select.val();
+        vertical = find_unit(
+          self.hidden, chapter, sequential, vertical_location);
+        set_datetime('start', vertical.start);
+        set_datetime('due', vertical.due);
+      }
+    });
+
+    // Add unit handler
+    $('#add-unit-button').on('click', function(event) {
+      event.preventDefault();
+      var chapter = chapter_select.val(),
+          sequential = sequential_select.val(),
+          vertical = vertical_select.val(),
+          units = find_lineage(self.schedule,
+            chapter,
+            sequential == 'all' ? null : sequential,
+            vertical == 'all' ? null: vertical),
+          start = get_datetime('start'),
+          due = get_datetime('due');
+      units.map(show);
+      unit = units[units.length - 1]
+      schedule_apply([unit], show);      
+      if (start) unit.start = start;
+      if (due) unit.due = due;
+      self.dirty = true;
+      self.render();
+    });
+
+    // Remove unit handler
+    $('table.poc-schedule a.remove-unit').on('click', function(event) {
+      var row = $(this).closest('tr'),
+          path = row.data('location').split(' '),
+          unit = find_unit(self.schedule, path[0], path[1], path[2]);
+      schedule_apply([unit], hide);
+      self.dirty = true;
+      self.render(); 
+    });
+
+    // Show or hide save button
+    if (this.dirty) $('#dirty-schedule').show()
+    else $('#dirty-schedule').hide();
+
+    // Handle save button
+    $('#dirty-schedule #save-changes').on('click', function(event) {
+        event.preventDefault();
+        self.save();
+    });
+
+    $('#ajax-error').hide();
+  }
+
+  /**
+   * Handle date entry.
+   */
+  function enterNewDate(what) {
+    return function(event) {
+      var row = $(this).closest('tr');
+      var modal = $('#enter-date-modal')
+        .data('what', what)
+        .data('location', row.data('location'));
+      modal.find('h2').text(
+          what == 'due' ? '${_("Enter Due Date")}' : 
+              '${_("Enter Start Date")}');
+      modal.find('label').text(row.find('td:first').text());
+
+      var path = row.data('location').split(' '),
+          unit = find_unit(self.schedule, path[0], path[1], path[2]),
+          parts = unit[what] ? unit[what].split(' ') : ['', ''],
+          date = parts[0],
+          time = parts[1];
+
+      modal.find('input[name=date]').val(date);
+      modal.find('input[name=time]').val(time);
+
+      modal.find('form').off('submit').on('submit', function(event) {
+        event.preventDefault();
+        var date = $(this).find('input[name=date]').val(),
+            time = $(this).find('input[name=time]').val();
+        unit[what] = date + ' ' + time;
+        modal.find('.close-modal').click();
+        self.dirty = true;
+        self.render();
+      });
+    }
+  }
+
+  /**
+   * Returns a sequence of <option> DOM elements for a particular sequence
+   * of schedule nodes.
+   */
+  function schedule_options(nodes) {
+    return nodes.map(function(node) {
+      return $('<option>')
+        .attr('value', node.location)
+        .text(node.display_name)[0];
+    });
+  }
+
+  /**
+   * Return a schedule pruned by the given filter function.
+   */
+  function pruned(tree, filter) {
+    return tree.filter(filter)
+      .map(function(node) {
+        var copy = {};
+        $.extend(copy, node);
+        if (node.children) copy.children = pruned(node.children, filter);
+        return copy;
+      })
+      .filter(function(node) {
+        return node.children === undefined || node.children.length;
+      });
+  }
+
+  /**
+   * Get table rows that represent the children of given row in the schedule
+   * tree.
+   */
+  function get_children(row) {
+    var depth = $(row).data('depth');
+    return $(row).nextUntil(
+      $(row).siblings().filter(function() {
+        return $(this).data('depth') <= depth;
+      })
+    );
+  }
+
+  /**
+   * Handle click event for expanding/collapsing nodes in the schedule tree.
+   */
+  function toggle_collapse(event) {
+    event.preventDefault();
+    var row = $(this).closest('tr');
+    var children = get_children(row);
+
+    if (row.is('.expanded')) {
+      $(this).removeClass('icon-caret-down').addClass('icon-caret-right');
+      row.removeClass('expanded').addClass('collapsed');
+      children.hide(); 
+    }
+
+    else {
+      $(this).removeClass('icon-caret-right').addClass('icon-caret-down');
+      row.removeClass('collapsed').addClass('expanded');
+      children.filter('.collapsed').each(function() {
+        children = children.not(get_children(this));
+      });
+      children.show(); 
+    }
+  }
+
+  /**
+   * Save changes.
+   */
+  self.save = function() {
+    var button = $('#dirty-schedule #save-changes');
+    button.prop('disabled', true).text('${_("Saving")}...');
+    
+    $.ajax({
+        url: save_url,
+        type: 'POST',
+        contentType: 'application/json',
+        data: JSON.stringify(this.schedule),
+        success: function(data, textStatus, jqXHR) {
+          self.schedule = data;
+          self.dirty = false;
+          self.render();
+          button.prop('disabled', false).text('${_("Save changes")}');
+        },
+        error: function(jqXHR, textStatus, error) {
+          console.log(jqXHR.responseText);
+          $('#ajax-error').show();
+          $('#dirty-schedule').hide();
+          $('form#add-unit select,input,button').prop('disabled', true);
+        }
+      });
+  }
+
+  /**
+   * Add all nodes.
+   */
+  $('#add-all').on('click', function(event) {
+      event.preventDefault();
+      schedule_apply(self.schedule, show);
+      self.dirty = true;
+      self.render();
+  });
+
+  /**
+   * Visit every tree node, applying function.
+   */
+  function schedule_apply(nodes, f) {
+    nodes.map(function(node) {
+      f(node);
+      if (node.children !== undefined) schedule_apply(node.children, f);
+    });
+  }
+
+  /**
+   * Find a unit in the tree.
+   */
+  function find_unit(tree, chapter, sequential, vertical) {
+    var units = find_lineage(tree, chapter, sequential, vertical);
+    return units[units.length -1];
+  }
+
+  function find_lineage(tree, chapter, sequential, vertical) {
+    function find_in(seq, location) {
+      for (var i = 0; i < seq.length; i++)
+        if (seq[i].location === location)
+          return seq[i];
+    }
+
+    var units = [],
+        unit = find_in(tree, chapter);
+    units[units.length] = unit;
+    if (sequential) {
+      units[units.length] = unit = find_in(unit.children, sequential);
+      if (vertical) 
+        units[units.length] = unit = find_in(unit.children, vertical);
+    }
+
+    return units;
+  }
+
+  return self;
+})();
+
+$(function() { poc_schedule.render(); });
+</script>
diff --git a/lms/templates/pocs/unenroll_email_allowedmessage.txt b/lms/templates/pocs/unenroll_email_allowedmessage.txt
new file mode 100644
index 0000000000..6eca90b8d5
--- /dev/null
+++ b/lms/templates/pocs/unenroll_email_allowedmessage.txt
@@ -0,0 +1,13 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+${_("Dear Student,")}
+
+${_("You have been un-enrolled from course {course_name} by a member "
+    "of the course staff. Please disregard the invitation "
+    "previously sent.").format(course_name=course.display_name)}
+
+----
+${_("This email was automatically sent from {site_name} "
+	"to {email_address}").format(
+		site_name=site_name, email_address=email_address
+	)}
diff --git a/lms/templates/pocs/unenroll_email_enrolledmessage.txt b/lms/templates/pocs/unenroll_email_enrolledmessage.txt
new file mode 100644
index 0000000000..38770886c0
--- /dev/null
+++ b/lms/templates/pocs/unenroll_email_enrolledmessage.txt
@@ -0,0 +1,17 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+${_("Dear {full_name}").format(full_name=full_name)}
+
+${_("You have been un-enrolled in {course_name} at {site_name} by a member "
+    "of the course staff. The course will no longer appear on your "
+    "{site_name} dashboard.").format(
+    	course_name=course.display_name, site_name=site_name
+    )}
+
+${_("Your other courses have not been affected.")}
+
+----
+${_("This email was automatically sent from {site_name} to "
+	"{full_name}").format(
+    	full_name=full_name, site_name=site_name
+    )}
diff --git a/lms/templates/pocs/unenroll_email_subject.txt b/lms/templates/pocs/unenroll_email_subject.txt
new file mode 100644
index 0000000000..4b971dcb35
--- /dev/null
+++ b/lms/templates/pocs/unenroll_email_subject.txt
@@ -0,0 +1,5 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+${_("You have been un-enrolled from {course_name}").format(
+	course_name=course.display_name
+)}
diff --git a/lms/urls.py b/lms/urls.py
index 512cb159ba..cc824c638c 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -343,6 +343,15 @@ if settings.COURSEWARE_ENABLED:
         # For the instructor
         url(r'^courses/{}/instructor$'.format(settings.COURSE_ID_PATTERN),
             'instructor.views.instructor_dashboard.instructor_dashboard_2', name="instructor_dashboard"),
+        url(r'^courses/{}/poc_coach$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.dashboard', name='poc_coach_dashboard'),
+        url(r'^courses/{}/create_poc$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.create_poc', name='create_poc'),
+        url(r'^courses/{}/save_poc$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.save_poc', name='save_poc'),
+        url(r'^courses/{}/poc_invite$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.poc_invite', name='poc_invite'),
+
         url(r'^courses/{}/set_course_mode_price$'.format(settings.COURSE_ID_PATTERN),
             'instructor.views.instructor_dashboard.set_course_mode_price', name="set_course_mode_price"),
         url(r'^courses/{}/instructor/api/'.format(settings.COURSE_ID_PATTERN),

From 12625a925505f4528882eca5748b9f59045c7daa Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Thu, 4 Dec 2014 19:38:36 -0800
Subject: [PATCH 03/29] MIT: CCX. Increase test coverage

Implelement test coverage for utility code supporting enrollments in CCXs

bugfix: prevent UnboundNameError if user does not exist in database.
---
 lms/djangoapps/pocs/tests/factories.py  |  17 +
 lms/djangoapps/pocs/tests/test_utils.py | 484 ++++++++++++++++++++++++
 lms/djangoapps/pocs/tests/test_views.py | 146 ++++++-
 lms/djangoapps/pocs/utils.py            |   1 +
 4 files changed, 644 insertions(+), 4 deletions(-)
 create mode 100644 lms/djangoapps/pocs/tests/factories.py
 create mode 100644 lms/djangoapps/pocs/tests/test_utils.py

diff --git a/lms/djangoapps/pocs/tests/factories.py b/lms/djangoapps/pocs/tests/factories.py
new file mode 100644
index 0000000000..1e98ae8846
--- /dev/null
+++ b/lms/djangoapps/pocs/tests/factories.py
@@ -0,0 +1,17 @@
+from factory.django import DjangoModelFactory
+from pocs.models import PersonalOnlineCourse
+from pocs.models import PocMembership
+from pocs.models import PocFutureMembership
+
+
+class PocFactory(DjangoModelFactory):
+    FACTORY_FOR = PersonalOnlineCourse
+    display_name = "Test POC"
+
+
+class PocMembershipFactory(DjangoModelFactory):
+    FACTORY_FOR = PocMembership
+    active = False
+
+class PocFutureMembershipFactory(DjangoModelFactory):
+    FACTORY_FOR = PocFutureMembership
diff --git a/lms/djangoapps/pocs/tests/test_utils.py b/lms/djangoapps/pocs/tests/test_utils.py
new file mode 100644
index 0000000000..9094215b9e
--- /dev/null
+++ b/lms/djangoapps/pocs/tests/test_utils.py
@@ -0,0 +1,484 @@
+from pocs.models import (
+    PocMembership,
+    PocFutureMembership,
+)
+from pocs.tests.factories import (
+    PocFactory,
+    PocMembershipFactory,
+    PocFutureMembershipFactory,
+)
+from student.roles import CoursePocCoachRole
+from student.tests.factories import (
+    AdminFactory,
+    UserFactory,
+)
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+
+
+class TestEmailEnrollmentState(ModuleStoreTestCase):
+    """unit tests for the EmailEnrollmentState class
+    """
+
+    def setUp(self):
+        """
+        Set up tests
+        """
+        course = CourseFactory.create()
+        coach = AdminFactory.create()
+        role = CoursePocCoachRole(course.id)
+        role.add_users(coach)
+        self.poc = PocFactory(course_id=course.id, coach=coach)
+
+    def create_user(self):
+        """provide a legitimate django user for testing
+        """
+        if getattr(self, 'user', None) is None:
+            self.user = UserFactory()
+
+    def register_user_in_poc(self):
+        """create registration of self.user in self.poc
+
+        registration will be inactive
+        """
+        self.create_user()
+        PocMembershipFactory(poc=self.poc, student=self.user)
+
+    def create_one(self, email=None):
+        """Create a single EmailEnrollmentState object and return it
+        """
+        from pocs.utils import EmailEnrollmentState
+        if email is None:
+            email = self.user.email
+        return EmailEnrollmentState(self.poc, email)
+
+    def test_enrollment_state_for_non_user(self):
+        """verify behavior for non-user email address
+        """
+        ee_state = self.create_one(email='nobody@nowhere.com')
+        for attr in ['user', 'member', 'full_name', 'in_poc']:
+            value = getattr(ee_state, attr, 'missing attribute')
+            self.assertFalse(value, "{}: {}".format(value, attr))
+
+    def test_enrollment_state_for_non_member_user(self):
+        """verify behavior for email address of user who is not a poc memeber
+        """
+        self.create_user()
+        ee_state = self.create_one()
+        self.assertTrue(ee_state.user)
+        self.assertFalse(ee_state.in_poc)
+        self.assertEqual(ee_state.member, self.user)
+        self.assertEqual(ee_state.full_name, self.user.profile.name)
+
+    def test_enrollment_state_for_member_user(self):
+        """verify behavior for email address of user who is a poc member
+        """
+        self.create_user()
+        self.register_user_in_poc()
+        ee_state = self.create_one()
+        for attr in ['user', 'in_poc']:
+            self.assertTrue(
+                getattr(ee_state, attr, False),
+                "attribute {} is missing or False".format(attr)
+            )
+        self.assertEqual(ee_state.member, self.user)
+        self.assertEqual(ee_state.full_name, self.user.profile.name)
+
+    def test_enrollment_state_to_dict(self):
+        """verify dict representation of EmailEnrollmentState
+        """
+        self.create_user()
+        self.register_user_in_poc()
+        ee_state = self.create_one()
+        ee_dict = ee_state.to_dict()
+        expected = {
+            'user': True,
+            'member': self.user,
+            'in_poc': True,
+        }
+        for expected_key, expected_value in expected.iteritems():
+            self.assertTrue(expected_key in ee_dict)
+            self.assertEqual(expected_value, ee_dict[expected_key])
+
+    def test_enrollment_state_repr(self):
+        self.create_user()
+        self.register_user_in_poc()
+        ee_state = self.create_one()
+        representation = repr(ee_state)
+        self.assertTrue('user=True' in representation)
+        self.assertTrue('in_poc=True' in representation)
+        member = 'member={}'.format(self.user)
+        self.assertTrue(member in representation)
+
+
+# TODO: deal with changes in behavior for auto_enroll
+class TestGetEmailParams(ModuleStoreTestCase):
+    """tests for pocs.utils.get_email_params
+    """
+    def setUp(self):
+        """
+        Set up tests
+        """
+        course = CourseFactory.create()
+        coach = AdminFactory.create()
+        role = CoursePocCoachRole(course.id)
+        role.add_users(coach)
+        self.poc = PocFactory(course_id=course.id, coach=coach)
+        self.all_keys = [
+            'site_name', 'course', 'course_url', 'registration_url',
+            'course_about_url', 'auto_enroll'
+        ]
+        self.url_keys = [k for k in self.all_keys if 'url' in k]
+        self.course_keys = [k for k in self.url_keys if 'course' in k]
+
+    def call_FUT(self, auto_enroll=False, secure=False):
+        from pocs.utils import get_email_params
+        return get_email_params(self.poc, auto_enroll, secure)
+
+    def test_params_have_expected_keys(self):
+        params = self.call_FUT()
+        self.assertFalse(set(params.keys()) - set(self.all_keys))
+
+    def test_poc_id_in_params(self):
+        expected_course_id = self.poc.course_id.to_deprecated_string()
+        params = self.call_FUT()
+        self.assertEqual(params['course'], self.poc)
+        for url_key in self.url_keys:
+            self.assertTrue('http://' in params[url_key])
+        for url_key in self.course_keys:
+            self.assertTrue(expected_course_id in params[url_key])
+
+    def test_security_respected(self):
+        secure = self.call_FUT(secure=True)
+        for url_key in self.url_keys:
+            self.assertTrue('https://' in secure[url_key])
+        insecure = self.call_FUT(secure=False)
+        for url_key in self.url_keys:
+            self.assertTrue('http://' in insecure[url_key])
+
+    def test_auto_enroll_passed_correctly(self):
+        not_auto = self.call_FUT(auto_enroll=False)
+        self.assertFalse(not_auto['auto_enroll'])
+        auto = self.call_FUT(auto_enroll=True)
+        self.assertTrue(auto['auto_enroll'])
+
+
+# TODO: deal with changes in behavior for auto_enroll
+class TestEnrollEmail(ModuleStoreTestCase):
+    """tests for the enroll_email function from pocs.utils
+    """
+    def setUp(self):
+        course = CourseFactory.create()
+        coach = AdminFactory.create()
+        role = CoursePocCoachRole(course.id)
+        role.add_users(coach)
+        self.poc = PocFactory(course_id=course.id, coach=coach)
+        self.outbox = self.get_outbox()
+
+    def create_user(self):
+        """provide a legitimate django user for testing
+        """
+        if getattr(self, 'user', None) is None:
+            self.user = UserFactory()
+
+    def register_user_in_poc(self):
+        """create registration of self.user in self.poc
+
+        registration will be inactive
+        """
+        self.create_user()
+        PocMembershipFactory(poc=self.poc, student=self.user)
+
+    def get_outbox(self):
+        """Return the django mail outbox"""
+        from django.core import mail
+        return mail.outbox
+
+    def check_membership(self, email=None, user=None, future=False):
+        """Verify tjat an appropriate Poc Membership exists"""
+        if not email and not user:
+            self.fail(
+                "must provide user or email address to check Poc Membership"
+            )
+        if future and email:
+            membership = PocFutureMembership.objects.filter(
+                poc=self.poc, email=email
+            )
+        elif not future:
+            if not user:
+                user = self.user
+            membership = PocMembership.objects.filter(
+                poc=self.poc, student=user
+            )
+        self.assertTrue(membership.exists())
+
+    def check_enrollment_state(self, state, in_poc, member, user):
+        """Verify an enrollment state object against provided arguments
+
+        state.in_poc will always be a boolean
+        state.user will always be a boolean
+        state.member will be a Django user object or None
+        """
+        self.assertEqual(in_poc, state.in_poc)
+        self.assertEqual(member, state.member)
+        self.assertEqual(user, state.user)
+
+    def call_FUT(
+        self,
+        student_email=None,
+        auto_enroll=False,
+        email_students=False,
+        email_params=None
+    ):
+        from pocs.utils import enroll_email
+        if student_email is None:
+            student_email = self.user.email
+        before, after = enroll_email(
+            self.poc, student_email, auto_enroll, email_students, email_params
+        )
+        return before, after
+
+    def test_enroll_non_user_sending_email(self):
+        """enroll a non-user email and send an enrollment email to them
+        """
+        # ensure no emails are in the outbox now
+        self.assertEqual(len(self.outbox), 0)
+        test_email = "nobody@nowhere.com"
+        before, after = self.call_FUT(
+            student_email=test_email, email_students=True
+        )
+
+        # there should be a future membership set for this email address now
+        self.check_membership(email=test_email, future=True)
+        for state in [before, after]:
+            self.check_enrollment_state(state, False, None, False)
+        # mail was sent and to the right person
+        self.assertEqual(len(self.outbox), 1)
+        msg = self.outbox[0]
+        self.assertTrue(test_email in msg.recipients())
+
+    def test_enroll_non_member_sending_email(self):
+        """register a non-member and send an enrollment email to them
+        """
+        self.create_user()
+        # ensure no emails are in the outbox now
+        self.assertEqual(len(self.outbox), 0)
+        before, after = self.call_FUT(email_students=True)
+
+        # there should be a membership set for this email address now
+        self.check_membership(email=self.user.email)
+        self.check_enrollment_state(before, False, self.user, True)
+        self.check_enrollment_state(after, True, self.user, True)
+        # mail was sent and to the right person
+        self.assertEqual(len(self.outbox), 1)
+        msg = self.outbox[0]
+        self.assertTrue(self.user.email in msg.recipients())
+
+    def test_enroll_member_sending_email(self):
+        """register a member and send an enrollment email to them
+        """
+        self.register_user_in_poc()
+        # ensure no emails are in the outbox now
+        self.assertEqual(len(self.outbox), 0)
+        before, after = self.call_FUT(email_students=True)
+
+        # there should be a membership set for this email address now
+        self.check_membership(email=self.user.email)
+        for state in [before, after]:
+            self.check_enrollment_state(state, True, self.user, True)
+        # mail was sent and to the right person
+        self.assertEqual(len(self.outbox), 1)
+        msg = self.outbox[0]
+        self.assertTrue(self.user.email in msg.recipients())
+
+    def test_enroll_non_user_no_email(self):
+        """register a non-user via email address but send no email
+        """
+        # ensure no emails are in the outbox now
+        self.assertEqual(len(self.outbox), 0)
+        test_email = "nobody@nowhere.com"
+        before, after = self.call_FUT(
+            student_email=test_email, email_students=False
+        )
+
+        # there should be a future membership set for this email address now
+        self.check_membership(email=test_email, future=True)
+        for state in [before, after]:
+            self.check_enrollment_state(state, False, None, False)
+        # ensure there are still no emails in the outbox now
+        self.assertEqual(len(self.outbox), 0)
+
+
+    def test_enroll_non_member_no_email(self):
+        """register a non-member but send no email"""
+        self.create_user()
+        # ensure no emails are in the outbox now
+        self.assertEqual(len(self.outbox), 0)
+        before, after = self.call_FUT(email_students=False)
+
+        # there should be a membership set for this email address now
+        self.check_membership(email=self.user.email)
+        self.check_enrollment_state(before, False, self.user, True)
+        self.check_enrollment_state(after, True, self.user, True)
+        # ensure there are still no emails in the outbox now
+        self.assertEqual(len(self.outbox), 0)
+
+    def test_enroll_member_no_email(self):
+        """enroll a member but send no email
+        """
+        self.register_user_in_poc()
+        # ensure no emails are in the outbox now
+        self.assertEqual(len(self.outbox), 0)
+        before, after = self.call_FUT(email_students=False)
+
+        # there should be a membership set for this email address now
+        self.check_membership(email=self.user.email)
+        for state in [before, after]:
+            self.check_enrollment_state(state, True, self.user, True)
+        # ensure there are still no emails in the outbox now
+        self.assertEqual(len(self.outbox), 0)
+
+
+# TODO: deal with changes in behavior for auto_enroll
+class TestUnenrollEmail(ModuleStoreTestCase):
+    """Tests for the unenroll_email function from pocs.utils"""
+    def setUp(self):
+        course = CourseFactory.create()
+        coach = AdminFactory.create()
+        role = CoursePocCoachRole(course.id)
+        role.add_users(coach)
+        self.poc = PocFactory(course_id=course.id, coach=coach)
+        self.outbox = self.get_outbox()
+
+    def tearDown(self):
+        for attr in ['user', 'email']:
+            if hasattr(self, attr):
+                delattr(self, attr)
+
+    def get_outbox(self):
+        """Return the django mail outbox"""
+        from django.core import mail
+        return mail.outbox
+
+    def create_user(self):
+        """provide a legitimate django user for testing
+        """
+        if getattr(self, 'user', None) is None:
+            self.user = UserFactory()
+
+    def make_poc_membership(self):
+        """create registration of self.user in self.poc
+
+        registration will be inactive
+        """
+        self.create_user()
+        PocMembershipFactory.create(poc=self.poc, student=self.user)
+
+    def make_poc_future_membership(self):
+        """create future registration for email in self.poc"""
+        self.email = "nobody@nowhere.com"
+        PocFutureMembershipFactory.create(
+            poc=self.poc, email=self.email
+        )
+
+    def check_enrollment_state(self, state, in_poc, member, user):
+        """Verify an enrollment state object against provided arguments
+
+        state.in_poc will always be a boolean
+        state.user will always be a boolean
+        state.member will be a Django user object or None
+        """
+        self.assertEqual(in_poc, state.in_poc)
+        self.assertEqual(member, state.member)
+        self.assertEqual(user, state.user)
+
+    def check_membership(self, future=False):
+        if future:
+            membership = PocFutureMembership.objects.filter(
+                poc=self.poc, email=self.email
+            )
+        else:
+            membership = PocMembership.objects.filter(
+                poc=self.poc, student=self.user
+            )
+        return membership.exists()
+
+    def call_FUT(self, email_students=False):
+        from pocs.utils import unenroll_email
+        email = hasattr(self, 'user') and self.user.email or self.email
+        return unenroll_email(self.poc, email, email_students=email_students)
+
+    def test_unenroll_future_member_with_email(self):
+        """unenroll a future member and send an email
+        """
+        self.make_poc_future_membership()
+        # assert that a membership exists and that no emails have been sent
+        self.assertTrue(self.check_membership(future=True))
+        self.assertEqual(len(self.outbox), 0)
+        # unenroll the student
+        before, after = self.call_FUT(email_students=True)
+
+        # assert that membership is now gone
+        self.assertFalse(self.check_membership(future=True))
+        # validate the before and after enrollment states
+        for state in [before, after]:
+            self.check_enrollment_state(state, False, None, False)
+        # check that mail was sent and to the right person
+        self.assertEqual(len(self.outbox), 1)
+        msg = self.outbox[0]
+        self.assertTrue(self.email in msg.recipients())
+
+    def test_unenroll_member_with_email(self):
+        """unenroll a current member and send an email"""
+        self.make_poc_membership()
+        # assert that a membership exists and that no emails have been sent
+        self.assertTrue(self.check_membership())
+        self.assertEqual(len(self.outbox), 0)
+        # unenroll the student
+        before, after = self.call_FUT(email_students=True)
+
+        # assert that membership is now gone
+        self.assertFalse(self.check_membership())
+        # validate the before and after enrollment state
+        self.check_enrollment_state(after, False, self.user, True)
+        self.check_enrollment_state(before, True, self.user, True)
+        # check that mail was sent and to the right person
+        self.assertEqual(len(self.outbox), 1)
+        msg = self.outbox[0]
+        self.assertTrue(self.user.email in msg.recipients())
+
+    def test_unenroll_future_member_no_email(self):
+        """unenroll a future member but send no email
+        """
+        self.make_poc_future_membership()
+        # assert that a membership exists and that no emails have been sent
+        self.assertTrue(self.check_membership(future=True))
+        self.assertEqual(len(self.outbox), 0)
+        # unenroll the student
+        before, after = self.call_FUT()
+
+        # assert that membership is now gone
+        self.assertFalse(self.check_membership(future=True))
+        # validate the before and after enrollment states
+        for state in [before, after]:
+            self.check_enrollment_state(state, False, None, False)
+        # no email was sent to the student
+        self.assertEqual(len(self.outbox), 0)
+
+    def test_unenroll_member_no_email(self):
+        """unenroll a current member but send no email
+        """
+        self.make_poc_membership()
+        # assert that a membership exists and that no emails have been sent
+        self.assertTrue(self.check_membership())
+        self.assertEqual(len(self.outbox), 0)
+        # unenroll the student
+        before, after = self.call_FUT()
+
+        # assert that membership is now gone
+        self.assertFalse(self.check_membership())
+        # validate the before and after enrollment state
+        self.check_enrollment_state(after, False, self.user, True)
+        self.check_enrollment_state(before, True, self.user, True)
+        # no email was sent to the student
+        self.assertEqual(len(self.outbox), 0)
diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index feaa83107f..0f5e3e0ba2 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -8,12 +8,26 @@ from courseware.tests.helpers import LoginEnrollmentTestCase
 from django.core.urlresolvers import reverse
 from edxmako.shortcuts import render_to_response
 from student.roles import CoursePocCoachRole
-from student.tests.factories import AdminFactory
+from student.tests.factories import (
+    AdminFactory,
+    CourseEnrollmentFactory,
+)
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
-
-from ..models import PersonalOnlineCourse
+from xmodule.modulestore.tests.factories import (
+    CourseFactory,
+    ItemFactory,
+)
+from ..models import (
+    PersonalOnlineCourse,
+    PocMembership,
+    PocFutureMembership,
+)
 from ..overrides import get_override_for_poc
+from .factories import (
+    PocFactory,
+    PocMembershipFactory,
+    PocFutureMembershipFactory,
+)
 
 
 def intercept_renderer(path, context):
@@ -65,6 +79,14 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         role = CoursePocCoachRole(self.course.id)
         role.add_users(self.coach)
 
+    def make_poc(self):
+        poc = PocFactory(course_id=self.course.id, coach=self.coach)
+        return poc
+
+    def get_outbox(self):
+        from django.core import mail
+        return mail.outbox
+
     def tearDown(self):
         """
         Undo patches.
@@ -158,6 +180,122 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         course_start = get_override_for_poc(poc, self.course, 'start')
         self.assertEqual(str(course_start)[:-9], u'2014-11-20 00:00')
 
+    def test_enroll_member_student(self):
+        self.make_coach()
+        poc = self.make_poc()
+        enrollment = CourseEnrollmentFactory(course_id=self.course.id)
+        student = enrollment.user
+        outbox = self.get_outbox()
+        self.assertEqual(len(outbox), 0)
+
+        url = reverse(
+            'poc_invite',
+            kwargs={'course_id': self.course.id.to_deprecated_string()}
+        )
+        data = {
+            'enrollment-button': 'Enroll',
+            'student-ids': u','.join([student.email, ]),
+        }
+        response = self.client.post(url, data=data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        # we were redirected to our current location
+        self.assertEqual(len(response.redirect_chain), 1)
+        self.assertTrue(302 in response.redirect_chain[0])
+        self.assertEqual(len(outbox), 1)
+        self.assertTrue(student.email in outbox[0].recipients())
+        # a PocMembership exists for this student
+        self.assertTrue(
+            PocMembership.objects.filter(poc=poc, student=student).exists()
+        )
+
+    def test_unenroll_member_student(self):
+        self.make_coach()
+        poc = self.make_poc()
+        enrollment = CourseEnrollmentFactory(course_id=self.course.id)
+        student = enrollment.user
+        outbox = self.get_outbox()
+        self.assertEqual(len(outbox), 0)
+        # student is member of POC:
+        PocMembershipFactory(poc=poc, student=student)
+
+        url = reverse(
+            'poc_invite',
+            kwargs={'course_id': self.course.id.to_deprecated_string()}
+        )
+        data = {
+            'enrollment-button': 'Unenroll',
+            'student-ids': u','.join([student.email, ]),
+        }
+        response = self.client.post(url, data=data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        # we were redirected to our current location
+        self.assertEqual(len(response.redirect_chain), 1)
+        self.assertTrue(302 in response.redirect_chain[0])
+        self.assertEqual(len(outbox), 1)
+        self.assertTrue(student.email in outbox[0].recipients())
+        # the membership for this student is gone
+        self.assertFalse(
+            PocMembership.objects.filter(poc=poc, student=student).exists()
+        )
+
+    def test_enroll_non_user_student(self):
+        test_email = "nobody@nowhere.com"
+        self.make_coach()
+        poc = self.make_poc()
+        outbox = self.get_outbox()
+        self.assertEqual(len(outbox), 0)
+
+        url = reverse(
+            'poc_invite',
+            kwargs={'course_id': self.course.id.to_deprecated_string()}
+        )
+        data = {
+            'enrollment-button': 'Enroll',
+            'student-ids': u','.join([test_email, ]),
+        }
+        response = self.client.post(url, data=data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        # we were redirected to our current location
+        self.assertEqual(len(response.redirect_chain), 1)
+        self.assertTrue(302 in response.redirect_chain[0])
+        self.assertEqual(len(outbox), 1)
+        self.assertTrue(test_email in outbox[0].recipients())
+        self.assertTrue(
+            PocFutureMembership.objects.filter(
+                poc=poc, email=test_email
+            ).exists()
+        )
+
+    def test_unenroll_non_user_student(self):
+        test_email = "nobody@nowhere.com"
+        self.make_coach()
+        poc = self.make_poc()
+        outbox = self.get_outbox()
+        PocFutureMembershipFactory(poc=poc, email=test_email)
+        self.assertEqual(len(outbox), 0)
+
+        url = reverse(
+            'poc_invite',
+            kwargs={'course_id': self.course.id.to_deprecated_string()}
+        )
+        data = {
+            'enrollment-button': 'Unenroll',
+            'student-ids': u','.join([test_email, ]),
+        }
+        response = self.client.post(url, data=data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        # we were redirected to our current location
+        self.assertEqual(len(response.redirect_chain), 1)
+        self.assertTrue(302 in response.redirect_chain[0])
+        self.assertEqual(len(outbox), 1)
+        self.assertTrue(test_email in outbox[0].recipients())
+        self.assertFalse(
+            PocFutureMembership.objects.filter(
+                poc=poc, email=test_email
+            ).exists()
+        )
+
+
 
 def flatten(seq):
     """
diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/pocs/utils.py
index 6890bc18c6..1dbf068902 100644
--- a/lms/djangoapps/pocs/utils.py
+++ b/lms/djangoapps/pocs/utils.py
@@ -31,6 +31,7 @@ class EmailEnrollmentState(object):
             in_poc = poc_member.exists()
             full_name = user.profile.name
         else:
+            user = None
             in_poc = False
             full_name = None
         self.user = exists_user

From cabb1962a6740deb626ad037ec508dfa773d9b18 Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Fri, 5 Dec 2014 19:54:38 -0800
Subject: [PATCH 04/29] MIT: CCX.  Code Quality fixes

---
 lms/djangoapps/pocs/utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/pocs/utils.py
index 1dbf068902..718c95232b 100644
--- a/lms/djangoapps/pocs/utils.py
+++ b/lms/djangoapps/pocs/utils.py
@@ -101,7 +101,9 @@ def unenroll_email(poc, student_email, email_students=False, email_params=None):
         if PocFutureMembership.objects.filter(
             poc=poc, email=student_email
         ).exists():
-            PocFutureMembership.get(poc=poc, email=student_email).delete()
+            PocFutureMembership.objects.get(
+                poc=poc, email=student_email
+            ).delete()
         if email_students:
             email_params['message'] = 'allowed_unenroll'
             email_params['email_address'] = student_email

From 630d1ce0d42837333dd39522c258a998afd85087 Mon Sep 17 00:00:00 2001
From: Chris Rossi <chris@archimedeanco.com>
Date: Tue, 9 Dec 2014 11:59:52 -0500
Subject: [PATCH 05/29] MIT: CCX. Implement coach interactions with student
 grades

Story #4: Coaches sees grades.

Story #9: Coach downloads grades.
---
 lms/djangoapps/pocs/tests/test_views.py | 84 +++++++++++++++++++++++++
 lms/djangoapps/pocs/views.py            | 83 ++++++++++++++++++++++++
 lms/templates/pocs/coach_dashboard.html |  6 ++
 lms/templates/pocs/student_admin.html   | 11 ++++
 lms/urls.py                             |  4 ++
 5 files changed, 188 insertions(+)
 create mode 100644 lms/templates/pocs/student_admin.html

diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index 0f5e3e0ba2..be5c830eb3 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -4,6 +4,8 @@ import re
 import pytz
 from mock import patch
 
+from capa.tests.response_xml_factory import StringResponseXMLFactory
+from courseware.tests.factories import StudentModuleFactory
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from django.core.urlresolvers import reverse
 from edxmako.shortcuts import render_to_response
@@ -11,7 +13,9 @@ from student.roles import CoursePocCoachRole
 from student.tests.factories import (
     AdminFactory,
     CourseEnrollmentFactory,
+    UserFactory,
 )
+
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import (
     CourseFactory,
@@ -295,6 +299,86 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
             ).exists()
         )
 
+USER_COUNT = 2
+
+class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
+    """
+    Tests for Personal Online Courses views.
+    """
+    def setUp(self):
+        """
+        Set up tests
+        """
+        self.course = course = CourseFactory.create()
+
+        # Create instructor account
+        self.coach = coach = AdminFactory.create()
+        self.client.login(username=coach.username, password="test")
+
+        # Create a course outline
+        self.mooc_start = start = datetime.datetime(
+            2010, 5, 12, 2, 42, tzinfo=pytz.UTC)
+        chapter = ItemFactory.create(
+            start=start, parent=course, category='sequential')
+        section = ItemFactory.create(
+            parent=chapter,
+            category="sequential",
+            metadata={'graded': True, 'format': 'Homework'}
+        )
+
+        role = CoursePocCoachRole(self.course.id)
+        role.add_users(coach)
+        self.poc = poc = PocFactory(course_id=self.course.id, coach=self.coach)
+
+        self.users = [UserFactory.create() for _ in xrange(USER_COUNT)]
+        for user in self.users:
+            CourseEnrollmentFactory.create(user=user, course_id=self.course.id)
+            PocMembershipFactory(poc=poc, student=user, active=True)
+
+        for i in xrange(USER_COUNT - 1):
+            category = "problem"
+            item = ItemFactory.create(
+                parent_location=section.location,
+                category=category,
+                data=StringResponseXMLFactory().build_xml(answer='foo'),
+                metadata={'rerandomize': 'always'}
+            )
+
+            for j, user in enumerate(self.users):
+                StudentModuleFactory.create(
+                    grade=1 if i < j else 0,
+                    max_grade=1,
+                    student=user,
+                    course_id=self.course.id,
+                    module_state_key=item.location
+                )
+
+
+    @patch('pocs.views.render_to_response', intercept_renderer)
+    def test_gradebook(self):
+        url = reverse(
+            'poc_gradebook',
+            kwargs={'course_id': self.course.id.to_deprecated_string()}
+        )
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        student_info = response.mako_context['students']
+        self.assertEqual(len(student_info), USER_COUNT)
+        self.assertEqual(student_info[0]['grade_summary']['percent'], 0.0)
+        self.assertEqual(student_info[1]['grade_summary']['percent'], 0.02)
+        self.assertEqual(
+            student_info[1]['grade_summary']['grade_breakdown'][0]['percent'],
+            0.015)
+
+    def test_grades_csv(self):
+        url = reverse(
+            'poc_grades_csv',
+            kwargs={'course_id': self.course.id.to_deprecated_string()}
+        )
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(
+            len(response.content.strip().split('\n')), USER_COUNT + 1)
 
 
 def flatten(seq):
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 89c53f4e2f..30eba263a9 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -1,9 +1,12 @@
+import csv
 import datetime
 import functools
 import json
 import logging
 import pytz
 
+from cStringIO import StringIO
+
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseForbidden
 from django.core.exceptions import ValidationError
@@ -16,10 +19,12 @@ from django.contrib.auth.models import User
 
 from courseware.courses import get_course_by_id
 from courseware.field_overrides import disable_overrides
+from courseware.grades import iterate_grades_for
 from edxmako.shortcuts import render_to_response
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from student.roles import CoursePocCoachRole
 
+from instructor.offline_gradecalc import student_grades
 from instructor.views.api import _split_input_list
 from instructor.views.tools import get_student_from_identifier
 
@@ -68,6 +73,10 @@ def dashboard(request, course):
         'schedule': json.dumps(schedule, indent=4),
         'save_url': reverse('save_poc', kwargs={'course_id': course.id}),
         'poc_members': PocMembership.objects.filter(poc=poc),
+        'gradebook_url': reverse('poc_gradebook',
+                                 kwargs={'course_id': course.id}),
+        'grades_csv_url': reverse('poc_grades_csv',
+                                 kwargs={'course_id': course.id}),
     }
     if not poc:
         context['create_poc_url'] = reverse(
@@ -242,3 +251,77 @@ def poc_invite(request, course):
             pass  # maybe log this?
     url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
     return redirect(url)
+
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@coach_dashboard
+def poc_gradebook(request, course):
+    """
+    Show the gradebook for this POC.
+    """
+    poc = get_poc_for_coach(course, request.user)
+    enrolled_students = User.objects.filter(
+        pocmembership__poc=poc,
+        pocmembership__active=1
+    ).order_by('username').select_related("profile")
+
+    student_info = [
+        {
+            'username': student.username,
+            'id': student.id,
+            'email': student.email,
+            'grade_summary': student_grades(student, request, course),
+            'realname': student.profile.name,
+        }
+        for student in enrolled_students
+    ]
+
+    return render_to_response('courseware/gradebook.html', {
+        'students': student_info,
+        'course': course,
+        'course_id': course.id,
+        'staff_access': request.user.is_staff,
+        'ordered_grades': sorted(
+            course.grade_cutoffs.items(), key=lambda i: i[1], reverse=True),
+    })
+
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@coach_dashboard
+def poc_grades_csv(request, course):
+    poc = get_poc_for_coach(course, request.user)
+    enrolled_students = User.objects.filter(
+        pocmembership__poc=poc,
+        pocmembership__active=1
+    ).order_by('username').select_related("profile")
+    grades = iterate_grades_for(course.id, enrolled_students)
+
+    header = None
+    rows = []
+    for student, gradeset, err_msg in grades:
+        if gradeset:
+            # We were able to successfully grade this student for this course.
+            if not header:
+                # Encode the header row in utf-8 encoding in case there are
+                # unicode characters
+                header = [section['label'].encode('utf-8')
+                          for section in gradeset[u'section_breakdown']]
+                rows.append(["id", "email", "username", "grade"] + header)
+
+            percents = {
+                section['label']: section.get('percent', 0.0)
+                for section in gradeset[u'section_breakdown']
+                if 'label' in section
+            }
+
+            row_percents = [percents.get(label, 0.0) for label in header]
+            rows.append([student.id, student.email, student.username,
+                         gradeset['percent']] + row_percents)
+
+    buffer = StringIO()
+    writer = csv.writer(buffer)
+    for row in rows:
+        writer.writerow(row)
+
+    return HttpResponse(buffer.getvalue(), content_type='text/csv')
+
diff --git a/lms/templates/pocs/coach_dashboard.html b/lms/templates/pocs/coach_dashboard.html
index 3ad742619d..547fb20280 100644
--- a/lms/templates/pocs/coach_dashboard.html
+++ b/lms/templates/pocs/coach_dashboard.html
@@ -39,6 +39,9 @@
         <li class="nav-item">
           <a href="#" data-section="schedule">${_("Schedule")}</a>
         </li>
+        <li class="nav-item">
+          <a href="#" data-section="student_admin">${_("Student Admin")}</a>
+        </li>
       </ul>
       <section id="membership" class="idash-section">
         <%include file="enrollment.html" args="" />
@@ -46,6 +49,9 @@
       <section id="schedule" class="idash-section">
         <%include file="schedule.html" args="" />
       </section>
+      <section id="student_admin" class="idash-section">
+        <%include file="student_admin.html" args="" />
+      </section>
       %endif
 
     </section>
diff --git a/lms/templates/pocs/student_admin.html b/lms/templates/pocs/student_admin.html
new file mode 100644
index 0000000000..64663f319d
--- /dev/null
+++ b/lms/templates/pocs/student_admin.html
@@ -0,0 +1,11 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+<section>
+  <h2>${_('Student Grades')}</h2>
+  <p>
+    <a href="${gradebook_url}">${_('View gradebook')}</a>
+  </p>
+  <p>
+    <a href="${grades_csv_url}">${_('Download student grades')}</a>
+  </p>
+</section>
diff --git a/lms/urls.py b/lms/urls.py
index cc824c638c..8081156229 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -351,6 +351,10 @@ if settings.COURSEWARE_ENABLED:
             'pocs.views.save_poc', name='save_poc'),
         url(r'^courses/{}/poc_invite$'.format(settings.COURSE_ID_PATTERN),
             'pocs.views.poc_invite', name='poc_invite'),
+        url(r'^courses/{}/poc_gradebook$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.poc_gradebook', name='poc_gradebook'),
+        url(r'^courses/{}/poc_grades.csv$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.poc_grades_csv', name='poc_grades_csv'),
 
         url(r'^courses/{}/set_course_mode_price$'.format(settings.COURSE_ID_PATTERN),
             'instructor.views.instructor_dashboard.set_course_mode_price', name="set_course_mode_price"),

From 6cfc3a025f5d6dc90e4f76a950e698cbeb8bd5e8 Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Tue, 9 Dec 2014 16:00:58 -0800
Subject: [PATCH 06/29] MIT: CCX. Implement individual student enrollments

---
 lms/djangoapps/pocs/tests/test_views.py | 71 +++++++++++++++++++++++++
 lms/djangoapps/pocs/views.py            | 32 ++++++++++-
 lms/templates/pocs/coach_dashboard.html | 49 +++++++++++++++++
 lms/templates/pocs/enrollment.html      |  7 ++-
 lms/urls.py                             |  3 +-
 5 files changed, 158 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index be5c830eb3..50045e7967 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -185,6 +185,8 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(str(course_start)[:-9], u'2014-11-20 00:00')
 
     def test_enroll_member_student(self):
+        """enroll a list of students who are members of the class
+        """
         self.make_coach()
         poc = self.make_poc()
         enrollment = CourseEnrollmentFactory(course_id=self.course.id)
@@ -213,6 +215,8 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
 
     def test_unenroll_member_student(self):
+        """unenroll a list of students who are members of the class
+        """
         self.make_coach()
         poc = self.make_poc()
         enrollment = CourseEnrollmentFactory(course_id=self.course.id)
@@ -243,6 +247,8 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
 
     def test_enroll_non_user_student(self):
+        """enroll a list of students who are not users yet
+        """
         test_email = "nobody@nowhere.com"
         self.make_coach()
         poc = self.make_poc()
@@ -271,6 +277,8 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
 
     def test_unenroll_non_user_student(self):
+        """unenroll a list of students who are not users yet
+        """
         test_email = "nobody@nowhere.com"
         self.make_coach()
         poc = self.make_poc()
@@ -299,8 +307,71 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
             ).exists()
         )
 
+    def test_manage_add_single_student(self):
+        """enroll a single student who is a member of the class already
+        """
+        self.make_coach()
+        poc = self.make_poc()
+        enrollment = CourseEnrollmentFactory(course_id=self.course.id)
+        student = enrollment.user
+        # no emails have been sent so far
+        outbox = self.get_outbox()
+        self.assertEqual(len(outbox), 0)
+
+        url = reverse(
+            'poc_manage_student',
+            kwargs={'course_id': self.course.id.to_deprecated_string()}
+        )
+        data = {
+            'student-action': 'add',
+            'student-id': u','.join([student.email, ]),
+        }
+        response = self.client.post(url, data=data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        # we were redirected to our current location
+        self.assertEqual(len(response.redirect_chain), 1)
+        self.assertTrue(302 in response.redirect_chain[0])
+        self.assertEqual(len(outbox), 0)
+        # a PocMembership exists for this student
+        self.assertTrue(
+            PocMembership.objects.filter(poc=poc, student=student).exists()
+        )
+
+    def test_manage_remove_single_student(self):
+        """unenroll a single student who is a member of the class already
+        """
+        self.make_coach()
+        poc = self.make_poc()
+        enrollment = CourseEnrollmentFactory(course_id=self.course.id)
+        student = enrollment.user
+        PocMembershipFactory(poc=poc, student=student)
+        # no emails have been sent so far
+        outbox = self.get_outbox()
+        self.assertEqual(len(outbox), 0)
+
+        url = reverse(
+            'poc_manage_student',
+            kwargs={'course_id': self.course.id.to_deprecated_string()}
+        )
+        data = {
+            'student-action': 'revoke',
+            'student-id': u','.join([student.email, ]),
+        }
+        response = self.client.post(url, data=data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        # we were redirected to our current location
+        self.assertEqual(len(response.redirect_chain), 1)
+        self.assertTrue(302 in response.redirect_chain[0])
+        self.assertEqual(len(outbox), 0)
+        # a PocMembership exists for this student
+        self.assertFalse(
+            PocMembership.objects.filter(poc=poc, student=student).exists()
+        )
+
+
 USER_COUNT = 2
 
+
 class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Tests for Personal Online Courses views.
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 30eba263a9..43127b7b87 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -253,6 +253,37 @@ def poc_invite(request, course):
     return redirect(url)
 
 
+@ensure_csrf_cookie
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@coach_dashboard
+def poc_student_management(request, course):
+    """Manage the enrollment of individual students in a POC
+    """
+    poc = get_poc_for_coach(course, request.user)
+    action = request.POST.get('student-action', None)
+    student_id = request.POST.get('student-id', '')
+    user = email = None
+    try:
+        user = get_student_from_identifier(student_id)
+    except User.DoesNotExist:
+        email = student_id
+    else:
+        email = user.email
+
+    try:
+        validate_email(email)
+        if action == 'add':
+            # by decree, no emails sent to students added this way
+            enroll_email(poc, email, email_students=False)
+        elif action == 'revoke':
+            unenroll_email(poc, email, email_students=False)
+    except ValidationError:
+        pass  # XXX: log, report?
+
+    url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
+    return redirect(url)
+
+
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
 def poc_gradebook(request, course):
@@ -324,4 +355,3 @@ def poc_grades_csv(request, course):
         writer.writerow(row)
 
     return HttpResponse(buffer.getvalue(), content_type='text/csv')
-
diff --git a/lms/templates/pocs/coach_dashboard.html b/lms/templates/pocs/coach_dashboard.html
index 547fb20280..ee8e13ddf4 100644
--- a/lms/templates/pocs/coach_dashboard.html
+++ b/lms/templates/pocs/coach_dashboard.html
@@ -81,7 +81,56 @@
     }
   }
 
+  function setup_management_form() {
+
+    $(".member-lists-management form").on("submit", function (event) {
+      var target, action;
+      target = $(event.target);
+      if (target.serialize().indexOf('student-action') < 0) {
+        action = $('<input />', {
+          type: 'hidden',
+          name: 'student-action',
+          value: 'add'
+        });
+        target.append(action);
+      }
+    });
+
+    $(".member-lists-management form .add, .member-lists-management form .revoke").on("click", function(event) {
+        var target, form, action, studentId, selectedStudent;
+        event.preventDefault();
+        target = $(event.target);
+        form = target.parents('form').first();
+        if (target.hasClass('add')) {
+          // adding a new student, add the student-action input and submit
+          action = $('<input />', {
+            type: 'hidden',
+            name: 'student-action',
+            // this is untenable, tied to a translated value.  Fix it.
+            value: 'add'
+          });
+          form.append(action).submit();
+        } else if (target.hasClass('revoke')) {
+          // revoking access for a student, get set form values and submit
+          // get the email address of the student, since they might not be 'enrolled' yet.
+          selectedStudent = target.parent('td').siblings().last().text();
+          action = $('<input />', {
+            type: 'hidden',
+            name: 'student-action',
+            value: 'revoke'
+          });
+          studentId = $('<input />', {
+            type: 'hidden',
+            name: 'student-id',
+            value: selectedStudent
+          });
+          form.append(action, studentId).submit();
+        }
+    });
+  }
+
   $(setup_tabs);
+  $(setup_management_form)
 
 
 </script>
diff --git a/lms/templates/pocs/enrollment.html b/lms/templates/pocs/enrollment.html
index 01071f7116..15d8942a6a 100644
--- a/lms/templates/pocs/enrollment.html
+++ b/lms/templates/pocs/enrollment.html
@@ -46,6 +46,8 @@
 </div>
 
 <div class="member-lists-management" style="float:left;width:50%">
+  <form method="POST" action="poc_manage_student">
+  <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
   <div class="auth-list-container active">
     <div class="member-list-widget">
       <div class="member-list">
@@ -70,9 +72,10 @@
         </table>
       </div>
       <div class="bottom-bar">
-        <input name="add-field" class="add-field" placeholder="Enter username or email" type="text">
-        <input name="add" class="add" value="Add Student" type="button">
+        <input name="student-id" class="add-field" placeholder="Enter username or email" type="text">
+        <input name="student-action" class="add" value="Add Student" type="button">
       </div>
     </div>
   </div>
+  </form>
 </div> 
diff --git a/lms/urls.py b/lms/urls.py
index 8081156229..1fb8a406ef 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -351,11 +351,12 @@ if settings.COURSEWARE_ENABLED:
             'pocs.views.save_poc', name='save_poc'),
         url(r'^courses/{}/poc_invite$'.format(settings.COURSE_ID_PATTERN),
             'pocs.views.poc_invite', name='poc_invite'),
+        url(r'^courses/{}/poc_manage_student$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.poc_student_management', name='poc_manage_student'),
         url(r'^courses/{}/poc_gradebook$'.format(settings.COURSE_ID_PATTERN),
             'pocs.views.poc_gradebook', name='poc_gradebook'),
         url(r'^courses/{}/poc_grades.csv$'.format(settings.COURSE_ID_PATTERN),
             'pocs.views.poc_grades_csv', name='poc_grades_csv'),
-
         url(r'^courses/{}/set_course_mode_price$'.format(settings.COURSE_ID_PATTERN),
             'instructor.views.instructor_dashboard.set_course_mode_price', name="set_course_mode_price"),
         url(r'^courses/{}/instructor/api/'.format(settings.COURSE_ID_PATTERN),

From aa1333c363b1383cfa53620bdcdd34107e4681fc Mon Sep 17 00:00:00 2001
From: Chris Rossi <chris@archimedeanco.com>
Date: Tue, 16 Dec 2014 11:01:00 -0500
Subject: [PATCH 07/29] MIT: CCX. Hide course blocks not in the CCX from view
 for coaches and students

---
 common/lib/xmodule/xmodule/course_module.py   |  23 ++-
 lms/djangoapps/courseware/grades.py           |  15 +-
 .../instructor/offline_gradecalc.py           |   1 -
 lms/djangoapps/pocs/overrides.py              |  34 +++++
 lms/djangoapps/pocs/tests/test_views.py       | 139 ++++++++++++++----
 lms/djangoapps/pocs/views.py                  | 127 +++++++++-------
 6 files changed, 247 insertions(+), 92 deletions(-)

diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 48a6807510..08844018af 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -11,7 +11,7 @@ from datetime import datetime
 import dateutil.parser
 from lazy import lazy
 
-
+from xmodule.exceptions import UndefinedContext
 from xmodule.seq_module import SequenceDescriptor, SequenceModule
 from xmodule.graders import grader_from_conf
 from xmodule.tabs import CourseTabList
@@ -1213,21 +1213,34 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
 
 
         """
-
+        try:
+            module = getattr(self, '_xmodule', None)
+            if not module:
+                module = self
+        except UndefinedContext:
+            module = self
         all_descriptors = []
         graded_sections = {}
 
-        def yield_descriptor_descendents(module_descriptor):
-            for child in module_descriptor.get_children():
+        def yield_descendents(module):
+            for child in module.get_children():
                 yield child
-                for module_descriptor in yield_descriptor_descendents(child):
+                for module_descriptor in yield_descendents(child):
                     yield module_descriptor
 
+<<<<<<< HEAD
         for chapter in self.get_children():
             for section in chapter.get_children():
                 if section.graded:
                     xmoduledescriptors = list(yield_descriptor_descendents(section))
                     xmoduledescriptors.append(section)
+=======
+        for c in module.get_children():
+            for s in c.get_children():
+                if s.graded:
+                    xmoduledescriptors = list(yield_descendents(s))
+                    xmoduledescriptors.append(s)
+>>>>>>> Hide course blocks not in the CCX from view for coaches and students
 
                     # The xmoduledescriptors included here are only the ones that have scores.
                     section_description = {
diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index 1abfe2c092..199cb7da05 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -246,6 +246,8 @@ def _grade(student, request, course, keep_raw_scores):
 
         totaled_scores[section_format] = format_scores
 
+    # Grading policy might be overriden by a POC, need to reset it
+    course.set_grading_policy(course.grading_policy)
     grade_summary = course.grader.grade(totaled_scores, generate_random_scores=settings.GENERATE_PROFILE_SCORES)
 
     # We round the grade here, to make sure that the grade is an whole percentage and
@@ -329,6 +331,8 @@ def _progress_summary(student, request, course):
             # This student must not have access to the course.
             return None
 
+        course_module = getattr(course_module, '_x_module', course_module)
+
     submissions_scores = sub_api.get_scores(course.id.to_deprecated_string(), anonymous_id_for_user(student, course.id))
 
     chapters = []
@@ -479,7 +483,7 @@ def manual_transaction():
         transaction.commit()
 
 
-def iterate_grades_for(course_id, students):
+def iterate_grades_for(course_or_id, students):
     """Given a course_id and an iterable of students (User), yield a tuple of:
 
     (student, gradeset, err_msg) for every student enrolled in the course.
@@ -497,7 +501,10 @@ def iterate_grades_for(course_id, students):
         make up the final grade. (For display)
     - raw_scores: contains scores for every graded module
     """
-    course = courses.get_course_by_id(course_id)
+    if isinstance(course_or_id, basestring):
+        course = courses.get_course_by_id(course_or_id)
+    else:
+        course = course_or_id
 
     # We make a fake request because grading code expects to be able to look at
     # the request. We have to attach the correct user to the request before
@@ -505,7 +512,7 @@ def iterate_grades_for(course_id, students):
     request = RequestFactory().get('/')
 
     for student in students:
-        with dog_stats_api.timer('lms.grades.iterate_grades_for', tags=[u'action:{}'.format(course_id)]):
+        with dog_stats_api.timer('lms.grades.iterate_grades_for', tags=[u'action:{}'.format(course.id)]):
             try:
                 request.user = student
                 # Grading calls problem rendering, which calls masquerading,
@@ -522,7 +529,7 @@ def iterate_grades_for(course_id, students):
                     'Cannot grade student %s (%s) in course %s because of exception: %s',
                     student.username,
                     student.id,
-                    course_id,
+                    course.id,
                     exc.message
                 )
                 yield student, {}, exc.message
diff --git a/lms/djangoapps/instructor/offline_gradecalc.py b/lms/djangoapps/instructor/offline_gradecalc.py
index 83bb5f72d8..ad0b727acc 100644
--- a/lms/djangoapps/instructor/offline_gradecalc.py
+++ b/lms/djangoapps/instructor/offline_gradecalc.py
@@ -81,7 +81,6 @@ def student_grades(student, request, course, keep_raw_scores=False, use_offline=
     This is the main interface to get grades.  It has the same parameters as grades.grade, as well
     as use_offline.  If use_offline is True then this will look for an offline computed gradeset in the DB.
     '''
-
     if not use_offline:
         return grades.grade(student, request, course, keep_raw_scores=keep_raw_scores)
 
diff --git a/lms/djangoapps/pocs/overrides.py b/lms/djangoapps/pocs/overrides.py
index 5af4d799c9..0c9b61f456 100644
--- a/lms/djangoapps/pocs/overrides.py
+++ b/lms/djangoapps/pocs/overrides.py
@@ -3,6 +3,9 @@ API related to providing field overrides for individual students.  This is used
 by the individual due dates feature.
 """
 import json
+import threading
+
+from contextlib import contextmanager
 
 from courseware.field_overrides import FieldOverrideProvider
 
@@ -22,10 +25,41 @@ class PersonalOnlineCoursesOverrideProvider(FieldOverrideProvider):
         return default
 
 
+class _PocContext(threading.local):
+    """
+    A threading local used to implement the `with_poc` context manager, that
+    keeps track of the POC currently set as the context.
+    """
+    poc = None
+
+
+_POC_CONTEXT = _PocContext()
+
+
+@contextmanager
+def poc_context(poc):
+    """
+    A context manager which can be used to explicitly set the POC that is in
+    play for field overrides.  This mechanism overrides the standard mechanism
+    of looking in the user's session to see if they are enrolled in a POC and
+    viewing that POC.
+    """
+    prev = _POC_CONTEXT.poc
+    _POC_CONTEXT.poc = poc
+    yield
+    _POC_CONTEXT.poc = prev
+
+
 def get_current_poc(user):
     """
     TODO Needs to look in user's session
     """
+    # If poc context is explicitly set, that takes precedence over the user's
+    # session.
+    poc = _POC_CONTEXT.poc
+    if poc:
+        return poc
+
     # Temporary implementation.  Final implementation will need to look in
     # user's session so user can switch between (potentially multiple) POC and
     # MOOC views.  See courseware.courses.get_request_for_thread for idea to
diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index 50045e7967..edf4c6c040 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -5,9 +5,11 @@ import pytz
 from mock import patch
 
 from capa.tests.response_xml_factory import StringResponseXMLFactory
+from courseware.field_overrides import OverrideFieldData
 from courseware.tests.factories import StudentModuleFactory
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from django.core.urlresolvers import reverse
+from django.test.utils import override_settings
 from edxmako.shortcuts import render_to_response
 from student.roles import CoursePocCoachRole
 from student.tests.factories import (
@@ -26,7 +28,7 @@ from ..models import (
     PocMembership,
     PocFutureMembership,
 )
-from ..overrides import get_override_for_poc
+from ..overrides import get_override_for_poc, override_field_for_poc
 from .factories import (
     PocFactory,
     PocMembershipFactory,
@@ -369,9 +371,8 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
 
 
-USER_COUNT = 2
-
-
+@override_settings(FIELD_OVERRIDE_PROVIDERS=(
+    'pocs.overrides.PersonalOnlineCoursesOverrideProvider',))
 class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Tests for Personal Online Courses views.
@@ -391,39 +392,65 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
             2010, 5, 12, 2, 42, tzinfo=pytz.UTC)
         chapter = ItemFactory.create(
             start=start, parent=course, category='sequential')
-        section = ItemFactory.create(
-            parent=chapter,
-            category="sequential",
-            metadata={'graded': True, 'format': 'Homework'}
-        )
+        sections = [
+            ItemFactory.create(
+                parent=chapter,
+                category="sequential",
+                metadata={'graded': True, 'format': 'Homework'})
+            for _ in xrange(4)]
 
         role = CoursePocCoachRole(self.course.id)
         role.add_users(coach)
         self.poc = poc = PocFactory(course_id=self.course.id, coach=self.coach)
 
-        self.users = [UserFactory.create() for _ in xrange(USER_COUNT)]
-        for user in self.users:
-            CourseEnrollmentFactory.create(user=user, course_id=self.course.id)
-            PocMembershipFactory(poc=poc, student=user, active=True)
+        self.student = student = UserFactory.create()
+        CourseEnrollmentFactory.create(user=student, course_id=self.course.id)
+        PocMembershipFactory(poc=poc, student=student, active=True)
 
-        for i in xrange(USER_COUNT - 1):
-            category = "problem"
-            item = ItemFactory.create(
-                parent_location=section.location,
-                category=category,
-                data=StringResponseXMLFactory().build_xml(answer='foo'),
-                metadata={'rerandomize': 'always'}
-            )
+        for i, section in enumerate(sections):
+            for j in xrange(4):
+                item = ItemFactory.create(
+                    parent=section,
+                    category="problem",
+                    data=StringResponseXMLFactory().build_xml(answer='foo'),
+                    metadata={'rerandomize': 'always'}
+                )
 
-            for j, user in enumerate(self.users):
                 StudentModuleFactory.create(
                     grade=1 if i < j else 0,
                     max_grade=1,
-                    student=user,
+                    student=student,
                     course_id=self.course.id,
                     module_state_key=item.location
                 )
 
+        # Apparently the test harness doesn't use LmsFieldStorage, and I'm not
+        # sure if there's a way to poke the test harness to do so.  So, we'll
+        # just inject the override field storage in this brute force manner.
+        OverrideFieldData.provider_classes = None
+        for block in iter_blocks(course):
+            block._field_data = OverrideFieldData.wrap(  # pylint: disable=protected-access
+                coach, block._field_data)  # pylint: disable=protected-access
+            block._field_data_cache = {}
+            visible_children(block)
+
+        patch_context = patch('pocs.views.get_course_by_id')
+        get_course = patch_context.start()
+        get_course.return_value = course
+        self.addCleanup(patch_context.stop)
+
+        override_field_for_poc(poc, course, 'grading_policy', {
+            'GRADER': [
+                {'drop_count': 0,
+                 'min_count': 2,
+                 'short_label': 'HW',
+                 'type': 'Homework',
+                 'weight': 1}
+            ],
+            'GRADE_CUTOFFS': {'Pass': 0.75},
+        })
+        override_field_for_poc(
+            poc, sections[-1], 'visible_to_staff_only', True)
 
     @patch('pocs.views.render_to_response', intercept_renderer)
     def test_gradebook(self):
@@ -433,13 +460,13 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        student_info = response.mako_context['students']
-        self.assertEqual(len(student_info), USER_COUNT)
-        self.assertEqual(student_info[0]['grade_summary']['percent'], 0.0)
-        self.assertEqual(student_info[1]['grade_summary']['percent'], 0.02)
+        student_info = response.mako_context['students'][0]
+        self.assertEqual(student_info['grade_summary']['percent'], 0.5)
         self.assertEqual(
-            student_info[1]['grade_summary']['grade_breakdown'][0]['percent'],
-            0.015)
+            student_info['grade_summary']['grade_breakdown'][0]['percent'],
+            0.5)
+        self.assertEqual(
+            len(student_info['grade_summary']['section_breakdown']), 4)
 
     def test_grades_csv(self):
         url = reverse(
@@ -448,8 +475,35 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(
-            len(response.content.strip().split('\n')), USER_COUNT + 1)
+        headers, row = (
+            row.strip().split(',') for row in
+            response.content.strip().split('\n')
+        )
+        data = dict(zip(headers, row))
+        self.assertEqual(data['HW 01'], '0.75')
+        self.assertEqual(data['HW 02'], '0.5')
+        self.assertEqual(data['HW 03'], '0.25')
+        self.assertEqual(data['HW Avg'], '0.5')
+        self.assertTrue('HW 04' not in data)
+
+    @patch('courseware.views.render_to_response', intercept_renderer)
+    def test_student_progress(self):
+        patch_context = patch('courseware.views.get_course_with_access')
+        get_course = patch_context.start()
+        get_course.return_value = self.course
+        self.addCleanup(patch_context.stop)
+
+        self.client.login(username=self.student.username, password="test")
+        url = reverse(
+            'progress',
+            kwargs={'course_id': self.course.id.to_deprecated_string()}
+        )
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        grades = response.mako_context['grade_summary']
+        self.assertEqual(grades['percent'], 0.5)
+        self.assertEqual( grades['grade_breakdown'][0]['percent'], 0.5)
+        self.assertEqual(len(grades['section_breakdown']), 4)
 
 
 def flatten(seq):
@@ -457,3 +511,26 @@ def flatten(seq):
     For [[1, 2], [3, 4]] returns [1, 2, 3, 4].  Does not recurse.
     """
     return [x for sub in seq for x in sub]
+
+
+def iter_blocks(course):
+    """
+    Returns an iterator over all of the blocks in a course.
+    """
+    def visit(block):
+        yield block
+        for child in block.get_children():
+            for descendant in visit(child):  # wish they'd backport yield from
+                yield descendant
+    return visit(course)
+
+def visible_children(block):
+    block_get_children = block.get_children
+    def get_children():
+        def iter_children():
+            for child in block_get_children():
+                child._field_data_cache = {}
+                if not child.visible_to_staff_only:
+                    yield child
+        return list(iter_children())
+    block.get_children = get_children
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 43127b7b87..86317ca6ad 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -20,6 +20,8 @@ from django.contrib.auth.models import User
 from courseware.courses import get_course_by_id
 from courseware.field_overrides import disable_overrides
 from courseware.grades import iterate_grades_for
+from courseware.model_data import FieldDataCache
+from courseware.module_render import get_module_for_descriptor
 from edxmako.shortcuts import render_to_response
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from student.roles import CoursePocCoachRole
@@ -33,6 +35,7 @@ from .overrides import (
     clear_override_for_poc,
     get_override_for_poc,
     override_field_for_poc,
+    poc_context,
 )
 from .utils import enroll_email, unenroll_email
 
@@ -290,68 +293,90 @@ def poc_gradebook(request, course):
     """
     Show the gradebook for this POC.
     """
+    # Need course module for overrides to function properly
+    field_data_cache = FieldDataCache.cache_for_descriptor_descendents(
+        course.id, request.user, course, depth=2)
+    course = get_module_for_descriptor(
+        request.user, request, course, field_data_cache, course.id)
+
     poc = get_poc_for_coach(course, request.user)
-    enrolled_students = User.objects.filter(
-        pocmembership__poc=poc,
-        pocmembership__active=1
-    ).order_by('username').select_related("profile")
+    with poc_context(poc):
+        course._field_data_cache = {}
+        course.set_grading_policy(course.grading_policy)  # this is so awful
+        enrolled_students = User.objects.filter(
+            pocmembership__poc=poc,
+            pocmembership__active=1
+        ).order_by('username').select_related("profile")
 
-    student_info = [
-        {
-            'username': student.username,
-            'id': student.id,
-            'email': student.email,
-            'grade_summary': student_grades(student, request, course),
-            'realname': student.profile.name,
-        }
-        for student in enrolled_students
-    ]
+        student_info = [
+            {
+                'username': student.username,
+                'id': student.id,
+                'email': student.email,
+                'grade_summary': student_grades(student, request, course),
+                'realname': student.profile.name,
+            }
+            for student in enrolled_students
+        ]
 
-    return render_to_response('courseware/gradebook.html', {
-        'students': student_info,
-        'course': course,
-        'course_id': course.id,
-        'staff_access': request.user.is_staff,
-        'ordered_grades': sorted(
-            course.grade_cutoffs.items(), key=lambda i: i[1], reverse=True),
-    })
+        return render_to_response('courseware/gradebook.html', {
+            'students': student_info,
+            'course': course,
+            'course_id': course.id,
+            'staff_access': request.user.is_staff,
+            'ordered_grades': sorted(
+                course.grade_cutoffs.items(), key=lambda i: i[1], reverse=True),
+        })
 
 
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
 def poc_grades_csv(request, course):
+    """
+    Download grades as CSV.
+    """
+    # Need course module for overrides to function properly
+    field_data_cache = FieldDataCache.cache_for_descriptor_descendents(
+        course.id, request.user, course, depth=2)
+    course = get_module_for_descriptor(
+        request.user, request, course, field_data_cache, course.id)
+
     poc = get_poc_for_coach(course, request.user)
-    enrolled_students = User.objects.filter(
-        pocmembership__poc=poc,
-        pocmembership__active=1
-    ).order_by('username').select_related("profile")
-    grades = iterate_grades_for(course.id, enrolled_students)
+    with poc_context(poc):
+        course._field_data_cache = {}
+        course.set_grading_policy(course.grading_policy)  # this is so awful
+        enrolled_students = User.objects.filter(
+            pocmembership__poc=poc,
+            pocmembership__active=1
+        ).order_by('username').select_related("profile")
+        grades = iterate_grades_for(course, enrolled_students)
 
-    header = None
-    rows = []
-    for student, gradeset, err_msg in grades:
-        if gradeset:
-            # We were able to successfully grade this student for this course.
-            if not header:
-                # Encode the header row in utf-8 encoding in case there are
-                # unicode characters
-                header = [section['label'].encode('utf-8')
-                          for section in gradeset[u'section_breakdown']]
-                rows.append(["id", "email", "username", "grade"] + header)
+        header = None
+        rows = []
+        for student, gradeset, err_msg in grades:
+            if gradeset:
+                # We were able to successfully grade this student for this
+                # course.
+                if not header:
+                    # Encode the header row in utf-8 encoding in case there are
+                    # unicode characters
+                    header = [section['label'].encode('utf-8')
+                              for section in gradeset[u'section_breakdown']]
+                    rows.append(["id", "email", "username", "grade"] + header)
 
-            percents = {
-                section['label']: section.get('percent', 0.0)
-                for section in gradeset[u'section_breakdown']
-                if 'label' in section
-            }
+                percents = {
+                    section['label']: section.get('percent', 0.0)
+                    for section in gradeset[u'section_breakdown']
+                    if 'label' in section
+                }
 
-            row_percents = [percents.get(label, 0.0) for label in header]
-            rows.append([student.id, student.email, student.username,
-                         gradeset['percent']] + row_percents)
+                row_percents = [percents.get(label, 0.0) for label in header]
+                rows.append([student.id, student.email, student.username,
+                             gradeset['percent']] + row_percents)
 
-    buffer = StringIO()
-    writer = csv.writer(buffer)
-    for row in rows:
-        writer.writerow(row)
+        buffer = StringIO()
+        writer = csv.writer(buffer)
+        for row in rows:
+            writer.writerow(row)
 
-    return HttpResponse(buffer.getvalue(), content_type='text/csv')
+        return HttpResponse(buffer.getvalue(), content_type='text/plain')

From e66fe2b3111c44b8efd7d2da8c5f6d76a15eb3ee Mon Sep 17 00:00:00 2001
From: Chris Rossi <chris@archimedeanco.com>
Date: Wed, 17 Dec 2014 10:59:03 -0500
Subject: [PATCH 08/29] MIT: CCX.  Properly handle possible representations of
 the course key

---
 lms/djangoapps/courseware/grades.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index 199cb7da05..5256456c87 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -24,6 +24,8 @@ from .models import StudentModule
 from .module_render import get_module_for_descriptor
 from submissions import api as sub_api  # installed from the edx-submissions repository
 from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import CourseKey
+
 
 
 log = logging.getLogger("edx.courseware")
@@ -501,7 +503,7 @@ def iterate_grades_for(course_or_id, students):
         make up the final grade. (For display)
     - raw_scores: contains scores for every graded module
     """
-    if isinstance(course_or_id, basestring):
+    if isinstance(course_or_id, (basestring, CourseKey)):
         course = courses.get_course_by_id(course_or_id)
     else:
         course = course_or_id

From 2c586ddbe4235392ce07f90d2aa668f5042bcf9a Mon Sep 17 00:00:00 2001
From: Chris Rossi <chris@archimedeanco.com>
Date: Wed, 17 Dec 2014 11:04:00 -0500
Subject: [PATCH 09/29] MIT: CCX.  Code Quality fixes

---
 lms/djangoapps/pocs/tests/factories.py  |  1 +
 lms/djangoapps/pocs/tests/test_utils.py |  1 -
 lms/djangoapps/pocs/tests/test_views.py |  4 +-
 lms/djangoapps/pocs/views.py            | 67 +++++++++++++++++--------
 4 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/lms/djangoapps/pocs/tests/factories.py b/lms/djangoapps/pocs/tests/factories.py
index 1e98ae8846..7cd54f8501 100644
--- a/lms/djangoapps/pocs/tests/factories.py
+++ b/lms/djangoapps/pocs/tests/factories.py
@@ -13,5 +13,6 @@ class PocMembershipFactory(DjangoModelFactory):
     FACTORY_FOR = PocMembership
     active = False
 
+
 class PocFutureMembershipFactory(DjangoModelFactory):
     FACTORY_FOR = PocFutureMembership
diff --git a/lms/djangoapps/pocs/tests/test_utils.py b/lms/djangoapps/pocs/tests/test_utils.py
index 9094215b9e..0fe9fbeee0 100644
--- a/lms/djangoapps/pocs/tests/test_utils.py
+++ b/lms/djangoapps/pocs/tests/test_utils.py
@@ -308,7 +308,6 @@ class TestEnrollEmail(ModuleStoreTestCase):
         # ensure there are still no emails in the outbox now
         self.assertEqual(len(self.outbox), 0)
 
-
     def test_enroll_non_member_no_email(self):
         """register a non-member but send no email"""
         self.create_user()
diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index edf4c6c040..032a5ccb88 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -502,7 +502,7 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(response.status_code, 200)
         grades = response.mako_context['grade_summary']
         self.assertEqual(grades['percent'], 0.5)
-        self.assertEqual( grades['grade_breakdown'][0]['percent'], 0.5)
+        self.assertEqual(grades['grade_breakdown'][0]['percent'], 0.5)
         self.assertEqual(len(grades['section_breakdown']), 4)
 
 
@@ -524,8 +524,10 @@ def iter_blocks(course):
                 yield descendant
     return visit(course)
 
+
 def visible_children(block):
     block_get_children = block.get_children
+
     def get_children():
         def iter_children():
             for child in block_get_children():
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 86317ca6ad..1bcc939fc0 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -1,3 +1,6 @@
+"""
+Views related to the Personal Online Courses feature.
+"""
 import csv
 import datetime
 import functools
@@ -40,7 +43,7 @@ from .overrides import (
 from .utils import enroll_email, unenroll_email
 
 log = logging.getLogger(__name__)
-today = datetime.datetime.today  # for patching in tests
+TODAY = datetime.datetime.today  # for patching in tests
 
 
 def coach_dashboard(view):
@@ -51,6 +54,10 @@ def coach_dashboard(view):
     """
     @functools.wraps(view)
     def wrapper(request, course_id):
+        """
+        Wraps the view function, performing access check, loading the course,
+        and modifying the view's call signature.
+        """
         course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
         role = CoursePocCoachRole(course_key)
         if not role.has_user(request.user):
@@ -79,7 +86,7 @@ def dashboard(request, course):
         'gradebook_url': reverse('poc_gradebook',
                                  kwargs={'course_id': course.id}),
         'grades_csv_url': reverse('poc_grades_csv',
-                                 kwargs={'course_id': course.id}),
+                                  kwargs={'course_id': course.id}),
     }
     if not poc:
         context['create_poc_url'] = reverse(
@@ -102,7 +109,7 @@ def create_poc(request, course):
     poc.save()
 
     # Make sure start/due are overridden for entire course
-    start = today().replace(tzinfo=pytz.UTC)
+    start = TODAY().replace(tzinfo=pytz.UTC)
     override_field_for_poc(poc, course, 'start', start)
     override_field_for_poc(poc, course, 'due', None)
 
@@ -124,11 +131,16 @@ def create_poc(request, course):
 @coach_dashboard
 def save_poc(request, course):
     """
-    Save changes to POC
+    Save changes to POC.
     """
     poc = get_poc_for_coach(course, request.user)
 
     def override_fields(parent, data, earliest=None):
+        """
+        Recursively apply POC schedule data to POC by overriding the
+        `visible_to_staff_only`, `start` and `due` fields for units in the
+        course.
+        """
         blocks = {
             str(child.location): child
             for child in parent.get_children()}
@@ -163,16 +175,17 @@ def save_poc(request, course):
         content_type='application/json')
 
 
-def parse_date(s):
-    if s:
-        try:
-            date, time = s.split(' ')
-            year, month, day = map(int, date.split('-'))
-            hour, minute = map(int, time.split(':'))
-            return datetime.datetime(
-                year, month, day, hour, minute, tzinfo=pytz.UTC)
-        except:
-            log.warn("Unable to parse date: " + s)
+def parse_date(datestring):
+    """
+    Generate a UTC datetime.datetime object from a string of the form
+    'YYYY-MM-DD HH:MM'.  If string is empty or `None`, returns `None`.
+    """
+    if datestring:
+        date, time = datestring.split(' ')
+        year, month, day = map(int, date.split('-'))
+        hour, minute = map(int, time.split(':'))
+        return datetime.datetime(
+            year, month, day, hour, minute, tzinfo=pytz.UTC)
 
     return None
 
@@ -192,8 +205,12 @@ def get_poc_for_coach(course, coach):
 
 def get_poc_schedule(course, poc):
     """
+    Generate a JSON serializable POC schedule.
     """
     def visit(node, depth=1):
+        """
+        Recursive generator function which yields POC schedule nodes.
+        """
         for child in node.get_children():
             start = get_override_for_poc(poc, child, 'start', None)
             if start:
@@ -301,8 +318,11 @@ def poc_gradebook(request, course):
 
     poc = get_poc_for_coach(course, request.user)
     with poc_context(poc):
-        course._field_data_cache = {}
-        course.set_grading_policy(course.grading_policy)  # this is so awful
+        # The grading policy for the MOOC is probably already cached.  We need
+        # to make sure we have the POC grading policy loaded.
+        course._field_data_cache = {}  # pylint: disable=protected-access
+        course.set_grading_policy(course.grading_policy)
+
         enrolled_students = User.objects.filter(
             pocmembership__poc=poc,
             pocmembership__active=1
@@ -343,8 +363,11 @@ def poc_grades_csv(request, course):
 
     poc = get_poc_for_coach(course, request.user)
     with poc_context(poc):
-        course._field_data_cache = {}
-        course.set_grading_policy(course.grading_policy)  # this is so awful
+        # The grading policy for the MOOC is probably already cached.  We need
+        # to make sure we have the POC grading policy loaded.
+        course._field_data_cache = {}  # pylint: disable=protected-access
+        course.set_grading_policy(course.grading_policy)
+
         enrolled_students = User.objects.filter(
             pocmembership__poc=poc,
             pocmembership__active=1
@@ -353,7 +376,7 @@ def poc_grades_csv(request, course):
 
         header = None
         rows = []
-        for student, gradeset, err_msg in grades:
+        for student, gradeset, __ in grades:
             if gradeset:
                 # We were able to successfully grade this student for this
                 # course.
@@ -374,9 +397,9 @@ def poc_grades_csv(request, course):
                 rows.append([student.id, student.email, student.username,
                              gradeset['percent']] + row_percents)
 
-        buffer = StringIO()
-        writer = csv.writer(buffer)
+        buf = StringIO()
+        writer = csv.writer(buf)
         for row in rows:
             writer.writerow(row)
 
-        return HttpResponse(buffer.getvalue(), content_type='text/plain')
+        return HttpResponse(buf.getvalue(), content_type='text/plain')

From eecefec8a0b6872f9385521bed368b28e7ca04d7 Mon Sep 17 00:00:00 2001
From: Chris Rossi <chris@archimedeanco.com>
Date: Wed, 17 Dec 2014 14:52:21 -0500
Subject: [PATCH 10/29] MIT: CCX. Implement coach customization of grading
 policy for a CCX

Story #35 As a coach I can see and edit the json for the grading policy.

Story #34 Recalculate grading policy

Repair the broken test for grading by providing an explicit POC context for the request to run in
---
 lms/djangoapps/pocs/tests/test_views.py | 61 +++++++++++++++++++------
 lms/djangoapps/pocs/views.py            | 53 +++++++++++++++++++--
 lms/templates/pocs/coach_dashboard.html |  6 +++
 lms/templates/pocs/grading_policy.html  | 10 ++++
 lms/templates/pocs/schedule.html        |  6 ++-
 lms/urls.py                             |  2 +
 6 files changed, 118 insertions(+), 20 deletions(-)
 create mode 100644 lms/templates/pocs/grading_policy.html

diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index 032a5ccb88..19ddf442c4 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -28,7 +28,11 @@ from ..models import (
     PocMembership,
     PocFutureMembership,
 )
-from ..overrides import get_override_for_poc, override_field_for_poc
+from ..overrides import (
+    get_override_for_poc,
+    override_field_for_poc,
+    poc_context,
+)
 from .factories import (
     PocFactory,
     PocMembershipFactory,
@@ -73,13 +77,18 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
                     for _ in xrange(2)]
         sequentials = flatten([
             [ItemFactory.create(parent=chapter) for _ in xrange(2)]
-            for chapter in chapters])
+            for chapter in chapters]
+        )
         verticals = flatten([
-            [ItemFactory.create(due=due, parent=sequential) for _ in xrange(2)]
-            for sequential in sequentials])
+            [ItemFactory.create(
+                due=due, parent=sequential, graded=True, format='Homework')
+                for _ in xrange(2)]
+            for sequential in sequentials]
+        )
         blocks = flatten([
             [ItemFactory.create(parent=vertical) for _ in xrange(2)]
-            for vertical in verticals])
+            for vertical in verticals]
+        )
 
     def make_coach(self):
         role = CoursePocCoachRole(self.course.id)
@@ -140,7 +149,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertTrue(re.search('id="poc-schedule"', response.content))
 
     @patch('pocs.views.render_to_response', intercept_renderer)
-    @patch('pocs.views.today')
+    @patch('pocs.views.TODAY')
     def test_edit_schedule(self, today):
         """
         Get POC schedule, modify it, save it.
@@ -166,14 +175,23 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
             'save_poc',
             kwargs={'course_id': self.course.id.to_deprecated_string()})
 
-        schedule[0]['hidden'] = False
+        def unhide(unit):
+            """
+            Recursively unhide a unit and all of its children in the POC
+            schedule.
+            """
+            unit['hidden'] = False
+            for child in unit.get('children', ()):
+                unhide(child)
+
+        unhide(schedule[0])
         schedule[0]['start'] = u'2014-11-20 00:00'
         schedule[0]['children'][0]['due'] = u'2014-12-25 00:00'  # what a jerk!
         response = self.client.post(
             url, json.dumps(schedule), content_type='application/json'
         )
 
-        schedule = json.loads(response.content)
+        schedule = json.loads(response.content)['schedule']
         self.assertEqual(schedule[0]['hidden'], False)
         self.assertEqual(schedule[0]['start'], u'2014-11-20 00:00')
         self.assertEqual(
@@ -186,6 +204,18 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         course_start = get_override_for_poc(poc, self.course, 'start')
         self.assertEqual(str(course_start)[:-9], u'2014-11-20 00:00')
 
+        # Make sure grading policy adjusted
+        policy = get_override_for_poc(poc, self.course, 'grading_policy',
+                                      self.course.grading_policy)
+        self.assertEqual(policy['GRADER'][0]['type'], 'Homework')
+        self.assertEqual(policy['GRADER'][0]['min_count'], 4)
+        self.assertEqual(policy['GRADER'][1]['type'], 'Lab')
+        self.assertEqual(policy['GRADER'][1]['min_count'], 0)
+        self.assertEqual(policy['GRADER'][2]['type'], 'Midterm Exam')
+        self.assertEqual(policy['GRADER'][2]['min_count'], 0)
+        self.assertEqual(policy['GRADER'][3]['type'], 'Final Exam')
+        self.assertEqual(policy['GRADER'][3]['min_count'], 0)
+
     def test_enroll_member_student(self):
         """enroll a list of students who are members of the class
         """
@@ -498,12 +528,15 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
             'progress',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        grades = response.mako_context['grade_summary']
-        self.assertEqual(grades['percent'], 0.5)
-        self.assertEqual(grades['grade_breakdown'][0]['percent'], 0.5)
-        self.assertEqual(len(grades['section_breakdown']), 4)
+
+        with poc_context(self.poc):
+
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)
+            grades = response.mako_context['grade_summary']
+            self.assertEqual(grades['percent'], 0.5)
+            self.assertEqual(grades['grade_breakdown'][0]['percent'], 0.5)
+            self.assertEqual(len(grades['section_breakdown']), 4)
 
 
 def flatten(seq):
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 1bcc939fc0..576102c686 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -8,6 +8,7 @@ import json
 import logging
 import pytz
 
+from copy import deepcopy
 from cStringIO import StringIO
 
 from django.core.urlresolvers import reverse
@@ -77,6 +78,8 @@ def dashboard(request, course):
     """
     poc = get_poc_for_coach(course, request.user)
     schedule = get_poc_schedule(course, poc)
+    grading_policy = get_override_for_poc(poc, course, 'grading_policy',
+                                          course.grading_policy)
     context = {
         'course': course,
         'poc': poc,
@@ -87,6 +90,9 @@ def dashboard(request, course):
                                  kwargs={'course_id': course.id}),
         'grades_csv_url': reverse('poc_grades_csv',
                                   kwargs={'course_id': course.id}),
+        'grading_policy': json.dumps(grading_policy, indent=4),
+        'grading_policy_url': reverse('poc_set_grading_policy',
+                                      kwargs={'course_id': course.id}),
     }
     if not poc:
         context['create_poc_url'] = reverse(
@@ -135,7 +141,7 @@ def save_poc(request, course):
     """
     poc = get_poc_for_coach(course, request.user)
 
-    def override_fields(parent, data, earliest=None):
+    def override_fields(parent, data, graded, earliest=None):
         """
         Recursively apply POC schedule data to POC by overriding the
         `visible_to_staff_only`, `start` and `due` fields for units in the
@@ -161,18 +167,55 @@ def save_poc(request, course):
             else:
                 clear_override_for_poc(poc, block, 'due')
 
+            if not unit['hidden'] and block.graded:
+               graded[block.format] = graded.get(block.format, 0) + 1
+
             children = unit.get('children', None)
             if children:
-                override_fields(block, children, earliest)
+                override_fields(block, children, graded, earliest)
         return earliest
 
-    earliest = override_fields(course, json.loads(request.body))
+    graded = {}
+    earliest = override_fields(course, json.loads(request.body), graded)
     if earliest:
         override_field_for_poc(poc, course, 'start', earliest)
 
+    # Attempt to automatically adjust grading policy
+    changed = False
+    policy = get_override_for_poc(
+        poc, course, 'grading_policy', course.grading_policy
+    )
+    policy = deepcopy(policy)
+    grader = policy['GRADER']
+    for section in grader:
+        count = graded.get(section.get('type'), 0)
+        if count < section['min_count']:
+            changed = True
+            section['min_count'] = count
+    if changed:
+        override_field_for_poc(poc, course, 'grading_policy', policy)
+
     return HttpResponse(
-        json.dumps(get_poc_schedule(course, poc)),
-        content_type='application/json')
+        json.dumps({
+            'schedule': get_poc_schedule(course, poc),
+            'grading_policy': json.dumps(policy, indent=4)}),
+        content_type='application/json',
+    )
+
+
+@ensure_csrf_cookie
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@coach_dashboard
+def set_grading_policy(request, course):
+    """
+    Set grading policy for the POC.
+    """
+    poc = get_poc_for_coach(course, request.user)
+    override_field_for_poc(
+        poc, course, 'grading_policy', json.loads(request.POST['policy']))
+
+    url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
+    return redirect(url)
 
 
 def parse_date(datestring):
diff --git a/lms/templates/pocs/coach_dashboard.html b/lms/templates/pocs/coach_dashboard.html
index ee8e13ddf4..1fb6e8f6d8 100644
--- a/lms/templates/pocs/coach_dashboard.html
+++ b/lms/templates/pocs/coach_dashboard.html
@@ -42,6 +42,9 @@
         <li class="nav-item">
           <a href="#" data-section="student_admin">${_("Student Admin")}</a>
         </li>
+        <li class="nav-item">
+          <a href="#" data-section="grading_policy">${_("Grading Policy")}</a>
+        </li>
       </ul>
       <section id="membership" class="idash-section">
         <%include file="enrollment.html" args="" />
@@ -52,6 +55,9 @@
       <section id="student_admin" class="idash-section">
         <%include file="student_admin.html" args="" />
       </section>
+      <section id="grading_policy" class="idash-section">
+        <%include file="grading_policy.html" args="" />
+      </section>
       %endif
 
     </section>
diff --git a/lms/templates/pocs/grading_policy.html b/lms/templates/pocs/grading_policy.html
new file mode 100644
index 0000000000..d641ee018d
--- /dev/null
+++ b/lms/templates/pocs/grading_policy.html
@@ -0,0 +1,10 @@
+<%! from django.utils.translation import ugettext as _ %>
+
+<h2>${_("Grading Policy")}</h2>
+
+<form action="${grading_policy_url}" method="POST">
+  <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
+  <textarea cols="80" style="height: 500px;"
+    name="policy" id="grading-policy">${grading_policy}</textarea><br/>
+  <button type="submit">${_("Save Grading Policy")}</button>
+</form>
diff --git a/lms/templates/pocs/schedule.html b/lms/templates/pocs/schedule.html
index 330070f085..94788a7c6d 100644
--- a/lms/templates/pocs/schedule.html
+++ b/lms/templates/pocs/schedule.html
@@ -436,10 +436,14 @@ var poc_schedule = (function () {
         contentType: 'application/json',
         data: JSON.stringify(this.schedule),
         success: function(data, textStatus, jqXHR) {
-          self.schedule = data;
+          self.schedule = data.schedule;
           self.dirty = false;
           self.render();
           button.prop('disabled', false).text('${_("Save changes")}');
+          
+          // Update textarea with grading policy JSON, since grading policy
+          // may have changed.  
+          $('#grading-policy').text(data.grading_policy);
         },
         error: function(jqXHR, textStatus, error) {
           console.log(jqXHR.responseText);
diff --git a/lms/urls.py b/lms/urls.py
index 1fb8a406ef..76ee70f599 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -357,6 +357,8 @@ if settings.COURSEWARE_ENABLED:
             'pocs.views.poc_gradebook', name='poc_gradebook'),
         url(r'^courses/{}/poc_grades.csv$'.format(settings.COURSE_ID_PATTERN),
             'pocs.views.poc_grades_csv', name='poc_grades_csv'),
+        url(r'^courses/{}/poc_set_grading_policy$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.set_grading_policy', name='poc_set_grading_policy'),
         url(r'^courses/{}/set_course_mode_price$'.format(settings.COURSE_ID_PATTERN),
             'instructor.views.instructor_dashboard.set_course_mode_price', name="set_course_mode_price"),
         url(r'^courses/{}/instructor/api/'.format(settings.COURSE_ID_PATTERN),

From 591c75a3eb63714cb8f3a97ab6286a341782ea3f Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Wed, 17 Dec 2014 13:05:20 -0800
Subject: [PATCH 11/29] MIT: CCX.  Provide template data for active POCs

Add a utility function to get template data for the POCs to which a user is actively registered

Add tests for the new utility
---
 lms/djangoapps/pocs/tests/test_utils.py | 65 +++++++++++++++++++++++++
 lms/djangoapps/pocs/utils.py            | 31 ++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/lms/djangoapps/pocs/tests/test_utils.py b/lms/djangoapps/pocs/tests/test_utils.py
index 0fe9fbeee0..242c5b98cd 100644
--- a/lms/djangoapps/pocs/tests/test_utils.py
+++ b/lms/djangoapps/pocs/tests/test_utils.py
@@ -11,6 +11,8 @@ from student.roles import CoursePocCoachRole
 from student.tests.factories import (
     AdminFactory,
     UserFactory,
+    CourseEnrollmentFactory,
+    AnonymousUserFactory,
 )
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
@@ -481,3 +483,66 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.check_enrollment_state(before, True, self.user, True)
         # no email was sent to the student
         self.assertEqual(len(self.outbox), 0)
+
+
+class TestUserPocList(ModuleStoreTestCase):
+    """Unit tests for poc.utils.get_all_pocs_for_user"""
+
+    def setUp(self):
+        """Create required infrastructure for tests"""
+        self.course = CourseFactory.create()
+        coach = AdminFactory.create()
+        role = CoursePocCoachRole(self.course.id)
+        role.add_users(coach)
+        self.poc = PocFactory(course_id=self.course.id, coach=coach)
+        enrollment = CourseEnrollmentFactory.create(course_id=self.course.id)
+        self.user = enrollment.user
+        self.anonymous = AnonymousUserFactory.create()
+
+    def register_user_in_poc(self, active=False):
+        """create registration of self.user in self.poc
+
+        registration will be inactive unless active=True
+        """
+        PocMembershipFactory(poc=self.poc, student=self.user, active=active)
+
+    def get_course_title(self):
+        from courseware.courses import get_course_about_section
+        return get_course_about_section(self.course, 'title')
+
+    def call_FUT(self, user):
+        from pocs.utils import get_all_pocs_for_user
+        return get_all_pocs_for_user(user)
+
+    def test_anonymous_sees_no_pocs(self):
+        memberships = self.call_FUT(self.anonymous)
+        self.assertEqual(len(memberships), 0)
+
+    def test_unenrolled_sees_no_pocs(self):
+        memberships = self.call_FUT(self.user)
+        self.assertEqual(len(memberships), 0)
+
+    def test_enrolled_inactive_sees_no_pocs(self):
+        self.register_user_in_poc()
+        memberships = self.call_FUT(self.user)
+        self.assertEqual(len(memberships), 0)
+
+    def test_enrolled_sees_a_poc(self):
+        self.register_user_in_poc(active=True)
+        memberships = self.call_FUT(self.user)
+        self.assertEqual(len(memberships), 1)
+
+    def test_data_structure(self):
+        self.register_user_in_poc(active=True)
+        memberships = self.call_FUT(self.user)
+        this_membership = memberships[0]
+        self.assertTrue(this_membership)
+        # structure contains the expected keys
+        for key in ['poc_name', 'poc_url']:
+            self.assertTrue(key in this_membership.keys())
+        url_parts = [self.course.id.to_deprecated_string(), str(self.poc.id)]
+        # all parts of the poc url are present
+        for part in url_parts:
+            self.assertTrue(part in this_membership['poc_url'])
+        actual_name = self.get_course_title()
+        self.assertTrue(actual_name in this_membership['poc_name'])
diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/pocs/utils.py
index 718c95232b..525deb8de5 100644
--- a/lms/djangoapps/pocs/utils.py
+++ b/lms/djangoapps/pocs/utils.py
@@ -10,7 +10,10 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.mail import send_mail
 
+from courseware.courses import get_course_about_section
+from courseware.courses import get_course_by_id
 from edxmako.shortcuts import render_to_string
+from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
 from microsite_configuration import microsite
 
@@ -214,3 +217,31 @@ def send_mail_to_student(student, param_dict):
             [student],
             fail_silently=False
         )
+
+
+def get_all_pocs_for_user(user):
+    """return all POCS to which the user is registered
+
+    Returns a list of dicts: {
+        poc_name: <formatted title of POC course>
+        poc_url: <url to view this POC>
+    }
+    """
+    if user.is_anonymous():
+        return []
+    active_poc_memberships = PocMembership.objects.filter(
+        student=user, active__exact=True
+    )
+    memberships = []
+    for membership in active_poc_memberships:
+        course = get_course_by_id(membership.poc.course_id)
+        title = 'POC: {}'.format(get_course_about_section(course, 'title'))
+        url = reverse(
+            'switch_active_poc',
+            args=[course.id.to_deprecated_string(), membership.poc.id]
+        )
+        memberships.append({
+            'poc_name': title,
+            'poc_url': url
+        })
+    return memberships

From 98b663dc6905e7ca5bb9e7d2519a6f59c5acb321 Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Wed, 17 Dec 2014 17:02:24 -0800
Subject: [PATCH 12/29] MIT: CCX. Implement mechanism for switching POC and
 MOOC views

Ensure there is a consistent key for the session dict that will store the value of the poc_id if one is active.  If none is active, the mooc is assumed to be active.

Add mooc_name, mooc_url and active to the dict for each poc membership.

Update the navigation template to show link to mooc if poc is active, or to poc if not.

Ensure the switch_active_pocs view is covered well with tests.
---
 lms/djangoapps/pocs/__init__.py         |   1 +
 lms/djangoapps/pocs/overrides.py        |  30 +++--
 lms/djangoapps/pocs/tests/test_views.py | 149 ++++++++++++++++++++++++
 lms/djangoapps/pocs/utils.py            |  23 +++-
 lms/djangoapps/pocs/views.py            |  52 ++++++++-
 lms/templates/navigation.html           |  10 ++
 lms/urls.py                             |   2 +
 7 files changed, 250 insertions(+), 17 deletions(-)

diff --git a/lms/djangoapps/pocs/__init__.py b/lms/djangoapps/pocs/__init__.py
index e69de29bb2..4da31a2dd5 100644
--- a/lms/djangoapps/pocs/__init__.py
+++ b/lms/djangoapps/pocs/__init__.py
@@ -0,0 +1 @@
+ACTIVE_POC_KEY = '_poc_id'
diff --git a/lms/djangoapps/pocs/overrides.py b/lms/djangoapps/pocs/overrides.py
index 0c9b61f456..08ed7a30a6 100644
--- a/lms/djangoapps/pocs/overrides.py
+++ b/lms/djangoapps/pocs/overrides.py
@@ -7,7 +7,9 @@ import threading
 
 from contextlib import contextmanager
 
+from courseware.courses import get_request_for_thread
 from courseware.field_overrides import FieldOverrideProvider
+from pocs import ACTIVE_POC_KEY
 
 from .models import PocMembership, PocFieldOverride
 
@@ -52,7 +54,11 @@ def poc_context(poc):
 
 def get_current_poc(user):
     """
-    TODO Needs to look in user's session
+    Return the poc that is active for this user
+
+    The user's session data is used to look up the active poc by id
+    If no poc is active, None is returned and MOOC view will take precedence
+    Active poc can be overridden by context manager (see `poc_context`)
     """
     # If poc context is explicitly set, that takes precedence over the user's
     # session.
@@ -60,16 +66,22 @@ def get_current_poc(user):
     if poc:
         return poc
 
-    # Temporary implementation.  Final implementation will need to look in
-    # user's session so user can switch between (potentially multiple) POC and
-    # MOOC views.  See courseware.courses.get_request_for_thread for idea to
-    # get at the request object.
-    try:
-        membership = PocMembership.objects.get(student=user, active=True)
-        return membership.poc
-    except PocMembership.DoesNotExist:
+    request = get_request_for_thread()
+    if request is None:
         return None
 
+    poc = None
+    poc_id = request.session.get(ACTIVE_POC_KEY, None)
+    if poc_id is not None:
+        try:
+            membership = PocMembership.objects.get(
+                student=user, active=True, poc__id__exact=poc_id
+            )
+            poc = membership.poc
+        except PocMembership.DoesNotExist:
+            pass
+    return poc
+
 
 def get_override_for_poc(poc, block, name, default=None):
     """
diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index 19ddf442c4..779ed46b76 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -23,6 +23,7 @@ from xmodule.modulestore.tests.factories import (
     CourseFactory,
     ItemFactory,
 )
+from pocs import ACTIVE_POC_KEY
 from ..models import (
     PersonalOnlineCourse,
     PocMembership,
@@ -539,6 +540,154 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
             self.assertEqual(len(grades['section_breakdown']), 4)
 
 
+class TestSwitchActivePoc(ModuleStoreTestCase, LoginEnrollmentTestCase):
+    """Verify the view for switching which POC is active, if any
+    """
+    def setUp(self):
+        self.course = course = CourseFactory.create()
+        coach = AdminFactory.create()
+        role = CoursePocCoachRole(course.id)
+        role.add_users(coach)
+        self.poc = PocFactory(course_id=course.id, coach=coach)
+        enrollment = CourseEnrollmentFactory.create(course_id=course.id)
+        self.user = enrollment.user
+        self.target_url = reverse(
+            'course_root', args=[course.id.to_deprecated_string()]
+        )
+
+    def register_user_in_poc(self, active=False):
+        """create registration of self.user in self.poc
+
+        registration will be inactive unless active=True
+        """
+        PocMembershipFactory(poc=self.poc, student=self.user, active=active)
+
+    def verify_active_poc(self, request, id=None):
+        if id:
+            id = str(id)
+        self.assertEqual(id, request.session.get(ACTIVE_POC_KEY, None))
+
+    def test_unauthorized_cannot_switch_to_poc(self):
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[self.course.id.to_deprecated_string(), self.poc.id]
+        )
+        response = self.client.get(switch_url)
+        self.assertEqual(response.status_code, 302)
+
+    def test_unauthorized_cannot_switch_to_mooc(self):
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[self.course.id.to_deprecated_string()]
+        )
+        response = self.client.get(switch_url)
+        self.assertEqual(response.status_code, 302)
+
+    def test_enrolled_inactive_user_cannot_select_poc(self):
+        self.register_user_in_poc(active=False)
+        self.client.login(username=self.user.username, password="test")
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[self.course.id.to_deprecated_string(), self.poc.id]
+        )
+        response = self.client.get(switch_url)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        # if the poc were active, we'd need to pass the ID of the poc here.
+        self.verify_active_poc(self.client)
+
+    def test_enrolled_user_can_select_poc(self):
+        self.register_user_in_poc(active=True)
+        self.client.login(username=self.user.username, password="test")
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[self.course.id.to_deprecated_string(), self.poc.id]
+        )
+        response = self.client.get(switch_url)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        self.verify_active_poc(self.client, self.poc.id)
+
+    def test_enrolled_user_can_select_mooc(self):
+        self.register_user_in_poc(active=True)
+        self.client.login(username=self.user.username, password="test")
+        # pre-seed the session with the poc id
+        session = self.client.session
+        session[ACTIVE_POC_KEY] = str(self.poc.id)
+        session.save()
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[self.course.id.to_deprecated_string()]
+        )
+        response = self.client.get(switch_url)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        self.verify_active_poc(self.client)
+
+    def test_unenrolled_user_cannot_select_poc(self):
+        self.client.login(username=self.user.username, password="test")
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[self.course.id.to_deprecated_string(), self.poc.id]
+        )
+        response = self.client.get(switch_url)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        # if the poc were active, we'd need to pass the ID of the poc here.
+        self.verify_active_poc(self.client)
+
+    def test_unenrolled_user_switched_to_mooc(self):
+        self.client.login(username=self.user.username, password="test")
+        # pre-seed the session with the poc id
+        session = self.client.session
+        session[ACTIVE_POC_KEY] = str(self.poc.id)
+        session.save()
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[self.course.id.to_deprecated_string(), self.poc.id]
+        )
+        response = self.client.get(switch_url)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        # we tried to select the poc but are not registered, so we are switched
+        # back to the mooc view
+        self.verify_active_poc(self.client)
+
+    def test_unassociated_course_and_poc_not_selected(self):
+        new_course = CourseFactory.create()
+        self.client.login(username=self.user.username, password="test")
+        expected_url = reverse(
+            'course_root', args=[new_course.id.to_deprecated_string()]
+        )
+        # the poc and the course are not related.
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[new_course.id.to_deprecated_string(), self.poc.id]
+        )
+        response = self.client.get(switch_url)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.get('Location', '').endswith(expected_url))
+        # the mooc should be active
+        self.verify_active_poc(self.client)
+
+    def test_missing_poc_cannot_be_selected(self):
+        self.register_user_in_poc()
+        self.client.login(username=self.user.username, password="test")
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[self.course.id.to_deprecated_string(), self.poc.id]
+        )
+        # delete the poc
+        self.poc.delete()
+
+        response = self.client.get(switch_url)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        # we tried to select the poc it doesn't exist anymore, so we are
+        # switched back to the mooc view
+        self.verify_active_poc(self.client)
+
+
 def flatten(seq):
     """
     For [[1, 2], [3, 4]] returns [1, 2, 3, 4].  Does not recurse.
diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/pocs/utils.py
index 525deb8de5..b597caafd4 100644
--- a/lms/djangoapps/pocs/utils.py
+++ b/lms/djangoapps/pocs/utils.py
@@ -17,12 +17,12 @@ from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
 from microsite_configuration import microsite
 
-from pocs.models import (
+from .models import (
     PersonalOnlineCourse,
     PocMembership,
     PocFutureMembership,
 )
-
+from .overrides import get_current_poc
 
 class EmailEnrollmentState(object):
     """ Store the complete enrollment state of an email in a class """
@@ -225,8 +225,12 @@ def get_all_pocs_for_user(user):
     Returns a list of dicts: {
         poc_name: <formatted title of POC course>
         poc_url: <url to view this POC>
+        poc_active: True if this poc is currently the 'active' one
+        mooc_name: <formatted title of the MOOC course for this POC>
+        mooc_url: <url to view this MOOC>
     }
     """
+    current_active_poc = get_current_poc(user)
     if user.is_anonymous():
         return []
     active_poc_memberships = PocMembership.objects.filter(
@@ -235,13 +239,22 @@ def get_all_pocs_for_user(user):
     memberships = []
     for membership in active_poc_memberships:
         course = get_course_by_id(membership.poc.course_id)
-        title = 'POC: {}'.format(get_course_about_section(course, 'title'))
+        course_title = get_course_about_section(course, 'title')
+        poc_title = 'POC: {}'.format(course_title)
+        mooc_title = 'MOOC: {}'.format(course_title)
         url = reverse(
             'switch_active_poc',
             args=[course.id.to_deprecated_string(), membership.poc.id]
         )
+        mooc_url = reverse(
+            'switch_active_poc',
+            args=[course.id.to_deprecated_string(),]
+        )
         memberships.append({
-            'poc_name': title,
-            'poc_url': url
+            'poc_name': poc_title,
+            'poc_url': url,
+            'active': membership.poc == current_active_poc,
+            'mooc_name': mooc_title,
+            'mooc_url': mooc_url,
         })
     return memberships
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 576102c686..7573dbdd5f 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -12,15 +12,21 @@ from copy import deepcopy
 from cStringIO import StringIO
 
 from django.core.urlresolvers import reverse
-from django.http import HttpResponse, HttpResponseForbidden
+from django.http import (
+    HttpResponse,
+    HttpResponseForbidden,
+    HttpResponseRedirect,
+)
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
 from django.shortcuts import redirect
 from django.utils.translation import ugettext as _
 from django.views.decorators.cache import cache_control
 from django_future.csrf import ensure_csrf_cookie
+from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 
+from courseware.courses import get_course
 from courseware.courses import get_course_by_id
 from courseware.field_overrides import disable_overrides
 from courseware.grades import iterate_grades_for
@@ -41,7 +47,13 @@ from .overrides import (
     override_field_for_poc,
     poc_context,
 )
-from .utils import enroll_email, unenroll_email
+from .utils import (
+    enroll_email,
+    unenroll_email,
+    get_all_pocs_for_user,
+)
+from pocs import ACTIVE_POC_KEY
+
 
 log = logging.getLogger(__name__)
 TODAY = datetime.datetime.today  # for patching in tests
@@ -403,7 +415,6 @@ def poc_grades_csv(request, course):
         course.id, request.user, course, depth=2)
     course = get_module_for_descriptor(
         request.user, request, course, field_data_cache, course.id)
-
     poc = get_poc_for_coach(course, request.user)
     with poc_context(poc):
         # The grading policy for the MOOC is probably already cached.  We need
@@ -446,3 +457,38 @@ def poc_grades_csv(request, course):
             writer.writerow(row)
 
         return HttpResponse(buf.getvalue(), content_type='text/plain')
+
+
+@login_required
+def swich_active_poc(request, course_id, poc_id=None):
+    """set the active POC for the logged-in user
+    """
+    user = request.user
+    if not user.is_authenticated():
+        return HttpResponseForbidden(
+            _('Only registered students may change POC views.')
+        )
+    course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
+    # will raise Http404 if course_id is bad
+    course = get_course_by_id(course_key)
+    course_url = reverse(
+        'course_root', args=[course.id.to_deprecated_string()]
+    )
+    if poc_id is not None:
+        try:
+            requested_poc = PersonalOnlineCourse.objects.get(pk=poc_id)
+            assert requested_poc.course_id.to_deprecated_string() == course_id
+            if not PocMembership.objects.filter(
+                poc=requested_poc, student=request.user, active=True
+            ).exists():
+                poc_id = None
+        except PersonalOnlineCourse.DoesNotExist:
+            # what to do here?  Log the failure?  Do we care?
+            poc_id = None
+        except AssertionError:
+            # what to do here?  Log the failure?  Do we care?
+            poc_id = None
+
+    request.session[ACTIVE_POC_KEY] = poc_id
+
+    return HttpResponseRedirect(course_url)
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index 2e82e73362..e66be26f63 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -13,6 +13,7 @@ from status.status import get_site_status_msg
 
 <%! from microsite_configuration import microsite %>
 <%! from microsite_configuration.templatetags.microsite import platform_name %>
+<%! from pocs.utils import get_all_pocs_for_user %>
 
 ## Provide a hook for themes to inject branding on top.
 <%block name="navigation_top" />
@@ -82,6 +83,15 @@ site_status_msg = get_site_status_msg(course_id)
             % if settings.MKTG_URL_LINK_MAP.get('FAQ'):
               <li><a href="${marketing_link('FAQ')}">${_("Help")}</a></li>
             % endif
+            % if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
+              %for poc in get_all_pocs_for_user(user):
+                % if poc['active']:
+                <li><a href="${poc['mooc_url']}" role="menuitem">${poc['mooc_name']}</a></li>
+                % else:
+                <li><a href="${poc['poc_url']}" role="menuitem">${poc['poc_name']}</a></li>
+                % endif
+              %endfor
+            % endif
           </%block>
           <li><a href="${reverse('logout')}" role="menuitem">${_("Sign out")}</a></li>
         </ul>
diff --git a/lms/urls.py b/lms/urls.py
index 76ee70f599..cbeea15512 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -359,6 +359,8 @@ if settings.COURSEWARE_ENABLED:
             'pocs.views.poc_grades_csv', name='poc_grades_csv'),
         url(r'^courses/{}/poc_set_grading_policy$'.format(settings.COURSE_ID_PATTERN),
             'pocs.views.set_grading_policy', name='poc_set_grading_policy'),
+        url(r'^courses/{}/swich_poc(?:/(?P<poc_id>[\d]+))?$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.swich_active_poc', name='switch_active_poc'),
         url(r'^courses/{}/set_course_mode_price$'.format(settings.COURSE_ID_PATTERN),
             'instructor.views.instructor_dashboard.set_course_mode_price', name="set_course_mode_price"),
         url(r'^courses/{}/instructor/api/'.format(settings.COURSE_ID_PATTERN),

From a1ed62089fd5b752310bb77b0ef895b210f6a8c8 Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Thu, 18 Dec 2014 23:28:57 -0800
Subject: [PATCH 13/29] MIT: CCX. Code Quality fixes

Remove unused assertion.  Login is required so this will never be used.  No point in having it here.
---
 lms/djangoapps/pocs/utils.py | 3 +--
 lms/djangoapps/pocs/views.py | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/pocs/utils.py
index b597caafd4..f39017fcd3 100644
--- a/lms/djangoapps/pocs/utils.py
+++ b/lms/djangoapps/pocs/utils.py
@@ -4,7 +4,6 @@ POC Enrollment operations for use by Coach APIs.
 Does not include any access control, be sure to check access before calling.
 """
 
-import json
 from django.contrib.auth.models import User
 from django.conf import settings
 from django.core.urlresolvers import reverse
@@ -13,7 +12,6 @@ from django.core.mail import send_mail
 from courseware.courses import get_course_about_section
 from courseware.courses import get_course_by_id
 from edxmako.shortcuts import render_to_string
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
 from microsite_configuration import microsite
 
@@ -24,6 +22,7 @@ from .models import (
 )
 from .overrides import get_current_poc
 
+
 class EmailEnrollmentState(object):
     """ Store the complete enrollment state of an email in a class """
     def __init__(self, poc, email):
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 7573dbdd5f..4f9eb50a4c 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -464,10 +464,6 @@ def swich_active_poc(request, course_id, poc_id=None):
     """set the active POC for the logged-in user
     """
     user = request.user
-    if not user.is_authenticated():
-        return HttpResponseForbidden(
-            _('Only registered students may change POC views.')
-        )
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
     # will raise Http404 if course_id is bad
     course = get_course_by_id(course_key)

From 2b4da4d836cf67f1241b83550a26de4a8de0cc0f Mon Sep 17 00:00:00 2001
From: Chris Rossi <chris@archimedeanco.com>
Date: Fri, 19 Dec 2014 11:58:37 -0500
Subject: [PATCH 14/29] MIT: CCX. Address performance issues.

Use client's session to set POC for test, now that we have the capability to do that.

Use a middleware to set the current POC one time per request, and avoid having to look up the stack for the current request in 'get_current_poc'.

Fetch all overrides for a block at one time.

Speed up the lineage computation by doing some caching.

Unused import.

Get field overrides once per user per block.

Streamline configuration.

Fix poc config tuples
---
 lms/djangoapps/courseware/field_overrides.py  | 21 ++++-
 .../courseware/student_field_overrides.py     | 37 +++++---
 lms/djangoapps/pocs/overrides.py              | 93 ++++++++++++-------
 lms/djangoapps/pocs/tests/test_views.py       | 26 +++---
 lms/djangoapps/pocs/views.py                  | 33 +++----
 lms/envs/aws.py                               | 14 +++
 lms/envs/test.py                              |  1 +
 7 files changed, 145 insertions(+), 80 deletions(-)

diff --git a/lms/djangoapps/courseware/field_overrides.py b/lms/djangoapps/courseware/field_overrides.py
index 2901d81953..a84dc001b4 100644
--- a/lms/djangoapps/courseware/field_overrides.py
+++ b/lms/djangoapps/courseware/field_overrides.py
@@ -199,7 +199,20 @@ def _lineage(block):
     Returns an iterator over all ancestors of the given block, starting with
     its immediate parent and ending at the root of the block tree.
     """
-    location = modulestore().get_parent_location(block.location)
-    while location:
-        yield modulestore().get_item(location)
-        location = modulestore().get_parent_location(location)
+    parent = _get_parent(block)
+    while parent:
+        yield parent
+        parent = _get_parent(parent)
+
+
+def _get_parent(block):
+    """
+    Gets parent of a block, trying to cache result.
+    """
+    if not hasattr(block, '_parent'):
+        store = modulestore()
+        # Call to get_parent_location is fairly expensive.  Is there a more
+        # performant way to get at the ancestors of a block?
+        location = store.get_parent_location(block.location)
+        block._parent = store.get_item(location) if location else None
+    return block._parent
diff --git a/lms/djangoapps/courseware/student_field_overrides.py b/lms/djangoapps/courseware/student_field_overrides.py
index 1e22efa6bc..9b9134b2aa 100644
--- a/lms/djangoapps/courseware/student_field_overrides.py
+++ b/lms/djangoapps/courseware/student_field_overrides.py
@@ -24,18 +24,31 @@ def get_override_for_user(user, block, name, default=None):
     specify the block and the name of the field.  If the field is not
     overridden for the given user, returns `default`.
     """
-    try:
-        override = StudentFieldOverride.objects.get(
-            course_id=block.runtime.course_id,
-            location=block.location,
-            student_id=user.id,
-            field=name
-        )
-        field = block.fields[name]
-        return field.from_json(json.loads(override.value))
-    except StudentFieldOverride.DoesNotExist:
-        pass
-    return default
+    if not hasattr(block, '_student_overrides'):
+        block._student_overrides = {}
+    overrides = block._student_overrides.get(user.id)
+    if overrides is None:
+        overrides = _get_overrides_for_user(user, block)
+        block._student_overrides[user.id] = overrides
+    return overrides.get(name, default)
+
+
+def _get_overrides_for_user(user, block):
+    """
+    Gets all of the individual student overrides for given user and block.
+    Returns a dictionary of field override values keyed by field name.
+    """
+    query = StudentFieldOverride.objects.filter(
+        course_id=block.runtime.course_id,
+        location=block.location,
+        student_id=user.id,
+    )
+    overrides = {}
+    for override in query:
+        field = block.fields[override.field]
+        value = field.from_json(json.loads(override.value))
+        overrides[override.field] = value
+    return overrides
 
 
 def override_field_for_user(user, block, name, value):
diff --git a/lms/djangoapps/pocs/overrides.py b/lms/djangoapps/pocs/overrides.py
index 08ed7a30a6..bc2506165d 100644
--- a/lms/djangoapps/pocs/overrides.py
+++ b/lms/djangoapps/pocs/overrides.py
@@ -7,7 +7,6 @@ import threading
 
 from contextlib import contextmanager
 
-from courseware.courses import get_request_for_thread
 from courseware.field_overrides import FieldOverrideProvider
 from pocs import ACTIVE_POC_KEY
 
@@ -54,34 +53,12 @@ def poc_context(poc):
 
 def get_current_poc(user):
     """
-    Return the poc that is active for this user
-
-    The user's session data is used to look up the active poc by id
-    If no poc is active, None is returned and MOOC view will take precedence
-    Active poc can be overridden by context manager (see `poc_context`)
+    Return the poc that is active for this request.
     """
-    # If poc context is explicitly set, that takes precedence over the user's
-    # session.
     poc = _POC_CONTEXT.poc
     if poc:
         return poc
 
-    request = get_request_for_thread()
-    if request is None:
-        return None
-
-    poc = None
-    poc_id = request.session.get(ACTIVE_POC_KEY, None)
-    if poc_id is not None:
-        try:
-            membership = PocMembership.objects.get(
-                student=user, active=True, poc__id__exact=poc_id
-            )
-            poc = membership.poc
-        except PocMembership.DoesNotExist:
-            pass
-    return poc
-
 
 def get_override_for_poc(poc, block, name, default=None):
     """
@@ -89,16 +66,30 @@ def get_override_for_poc(poc, block, name, default=None):
     specify the block and the name of the field.  If the field is not
     overridden for the given poc, returns `default`.
     """
-    try:
-        override = PocFieldOverride.objects.get(
-            poc=poc,
-            location=block.location,
-            field=name)
-        field = block.fields[name]
-        return field.from_json(json.loads(override.value))
-    except PocFieldOverride.DoesNotExist:
-        pass
-    return default
+    if not hasattr(block, '_poc_overrides'):
+        block._poc_overrides = {}
+    overrides = block._poc_overrides.get(poc.id)
+    if overrides is None:
+        overrides = _get_overrides_for_poc(poc, block)
+        block._poc_overrides[poc.id] = overrides
+    return overrides.get(name, default)
+
+
+def _get_overrides_for_poc(poc, block):
+    """
+    Returns a dictionary mapping field name to overriden value for any
+    overrides set on this block for this POC.
+    """
+    overrides = {}
+    query = PocFieldOverride.objects.filter(
+        poc=poc,
+        location=block.location
+    )
+    for override in query:
+        field = block.fields[override.field]
+        value = field.from_json(json.loads(override.value))
+        overrides[override.field] = value
+    return overrides
 
 
 def override_field_for_poc(poc, block, name, value):
@@ -115,6 +106,9 @@ def override_field_for_poc(poc, block, name, value):
     override.value = json.dumps(field.to_json(value))
     override.save()
 
+    if hasattr(block, '_poc_overrides'):
+        del block._poc_overrides[poc.id]
+
 
 def clear_override_for_poc(poc, block, name):
     """
@@ -128,5 +122,36 @@ def clear_override_for_poc(poc, block, name):
             poc=poc,
             location=block.location,
             field=name).delete()
+
+        if hasattr(block, '_poc_overrides'):
+            del block._poc_overrides[poc.id]
+
     except PocFieldOverride.DoesNotExist:
         pass
+
+
+class PocMiddleware(object):
+    """
+    Checks to see if current session is examining a POC and sets the POC as
+    the current POC for the override machinery if so.
+    """
+    def process_request(self, request):
+        """
+        Do the check.
+        """
+        poc_id = request.session.get(ACTIVE_POC_KEY, None)
+        if poc_id is not None:
+            try:
+                membership = PocMembership.objects.get(
+                    student=request.user, active=True, poc__id__exact=poc_id
+                )
+                _POC_CONTEXT.poc = membership.poc
+            except PocMembership.DoesNotExist:
+                pass
+
+    def process_response(self, request, response):
+        """
+        Clean up afterwards.
+        """
+        _POC_CONTEXT.poc = None
+        return response
diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index 779ed46b76..bd6693328f 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -29,11 +29,8 @@ from ..models import (
     PocMembership,
     PocFutureMembership,
 )
-from ..overrides import (
-    get_override_for_poc,
-    override_field_for_poc,
-    poc_context,
-)
+from ..overrides import get_override_for_poc, override_field_for_poc
+from .. import ACTIVE_POC_KEY
 from .factories import (
     PocFactory,
     PocMembershipFactory,
@@ -525,19 +522,20 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.addCleanup(patch_context.stop)
 
         self.client.login(username=self.student.username, password="test")
+        session = self.client.session
+        session[ACTIVE_POC_KEY] = self.poc.id
+        session.save()
+        self.client.session.get(ACTIVE_POC_KEY)
         url = reverse(
             'progress',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
-
-        with poc_context(self.poc):
-
-            response = self.client.get(url)
-            self.assertEqual(response.status_code, 200)
-            grades = response.mako_context['grade_summary']
-            self.assertEqual(grades['percent'], 0.5)
-            self.assertEqual(grades['grade_breakdown'][0]['percent'], 0.5)
-            self.assertEqual(len(grades['section_breakdown']), 4)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        grades = response.mako_context['grade_summary']
+        self.assertEqual(grades['percent'], 0.5)
+        self.assertEqual(grades['grade_breakdown'][0]['percent'], 0.5)
+        self.assertEqual(len(grades['section_breakdown']), 4)
 
 
 class TestSwitchActivePoc(ModuleStoreTestCase, LoginEnrollmentTestCase):
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 4f9eb50a4c..964a79bc1d 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -26,7 +26,6 @@ from django_future.csrf import ensure_csrf_cookie
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 
-from courseware.courses import get_course
 from courseware.courses import get_course_by_id
 from courseware.field_overrides import disable_overrides
 from courseware.grades import iterate_grades_for
@@ -50,7 +49,6 @@ from .overrides import (
 from .utils import (
     enroll_email,
     unenroll_email,
-    get_all_pocs_for_user,
 )
 from pocs import ACTIVE_POC_KEY
 
@@ -89,24 +87,27 @@ def dashboard(request, course):
     Display the POC Coach Dashboard.
     """
     poc = get_poc_for_coach(course, request.user)
-    schedule = get_poc_schedule(course, poc)
-    grading_policy = get_override_for_poc(poc, course, 'grading_policy',
-                                          course.grading_policy)
     context = {
         'course': course,
         'poc': poc,
-        'schedule': json.dumps(schedule, indent=4),
-        'save_url': reverse('save_poc', kwargs={'course_id': course.id}),
-        'poc_members': PocMembership.objects.filter(poc=poc),
-        'gradebook_url': reverse('poc_gradebook',
-                                 kwargs={'course_id': course.id}),
-        'grades_csv_url': reverse('poc_grades_csv',
-                                  kwargs={'course_id': course.id}),
-        'grading_policy': json.dumps(grading_policy, indent=4),
-        'grading_policy_url': reverse('poc_set_grading_policy',
-                                      kwargs={'course_id': course.id}),
     }
-    if not poc:
+
+    if poc:
+        schedule = get_poc_schedule(course, poc)
+        grading_policy = get_override_for_poc(
+            poc, course, 'grading_policy', course.grading_policy)
+        context['schedule'] = json.dumps(schedule, indent=4)
+        context['save_url'] = reverse(
+            'save_poc', kwargs={'course_id': course.id})
+        context['poc_members'] = PocMembership.objects.filter(poc=poc)
+        context['gradebook_url'] = reverse(
+            'poc_gradebook', kwargs={'course_id': course.id})
+        context['grades_csv_url'] = reverse(
+            'poc_grades_csv', kwargs={'course_id': course.id})
+        context['grading_policy'] = json.dumps(grading_policy, indent=4)
+        context['grading_policy_url'] = reverse(
+            'poc_set_grading_policy', kwargs={'course_id': course.id})
+    else:
         context['create_poc_url'] = reverse(
             'create_poc', kwargs={'course_id': course.id})
     return render_to_response('pocs/coach_dashboard.html', context)
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index b3892c62a7..76d9c77f93 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -576,3 +576,17 @@ ONLOAD_BEACON_SAMPLE_RATE = ENV_TOKENS.get('ONLOAD_BEACON_SAMPLE_RATE', ONLOAD_B
 ECOMMERCE_API_URL = ENV_TOKENS.get('ECOMMERCE_API_URL', ECOMMERCE_API_URL)
 ECOMMERCE_API_SIGNING_KEY = AUTH_TOKENS.get('ECOMMERCE_API_SIGNING_KEY', ECOMMERCE_API_SIGNING_KEY)
 ECOMMERCE_API_TIMEOUT = ENV_TOKENS.get('ECOMMERCE_API_TIMEOUT', ECOMMERCE_API_TIMEOUT)
+
+##### Personal Online Courses #####
+if FEATURES.get('PERSONAL_ONLINE_COURSES'):
+    INSTALLED_APPS += ('pocs',)
+    MIDDLEWARE_CLASSES += ('pocs.overrides.PocMiddleware',)
+    FIELD_OVERRIDE_PROVIDERS += (
+        'pocs.overrides.PersonalOnlineCoursesOverrideProvider',
+    )
+
+##### Individual Due Date Extensions #####
+if FEATURES.get('INDIVIDUAL_DUE_DATES'):
+    FIELD_OVERRIDE_PROVIDERS += (
+        'courseware.student_field_overrides.IndividualStudentOverrideProvider',
+    )
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 35d1c5285c..6a2e26109a 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -471,3 +471,4 @@ FEATURES['CERTIFICATES_HTML_VIEW'] = True
 
 ######### personal online courses #########
 INSTALLED_APPS += ('pocs',)
+MIDDLEWARE_CLASSES += ('pocs.overrides.PocMiddleware',)

From d4a1e99a835aaa211a817f6441b0acac7da77332 Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Tue, 30 Dec 2014 14:25:06 -0800
Subject: [PATCH 15/29] MIT: CCX.  Implement auto-enroll for CCX students

Based loosely on course enrollment model

Ensure that registered users are 'active' when they are enrolled in a POC

Respect the 'auto enroll' and 'email students' checkboxes in the UI

Add an auto_enroll flag to the PocFutureMembership model so we can automatically enroll non-users when they have registered and activated their account.

Build a future enrollment using the auto_enroll value from the request so we can ensure that non-existent users can be auto-enrolled

Ensure that any user added by way of the one-at-a-time UI is automatically auto-enrolled

Update tests with email sending to use the flag from the request

Provide api on the PocMembership object to auto-enroll a newly active member in this poc.

This method will delete the passed PocFutureMembership object and will automatically enroll the user in the POC named in that future membership as well as the MOOC from which it was created

Conditionally activate poc memberships that are pending when a new registree first activates their account.
---
 common/djangoapps/student/views.py            | 10 +++
 ..._poc_membership_future_auto_enroll_flag.py | 90 +++++++++++++++++++
 lms/djangoapps/pocs/models.py                 | 16 ++++
 lms/djangoapps/pocs/tests/test_views.py       |  4 +
 lms/djangoapps/pocs/utils.py                  | 13 ++-
 lms/djangoapps/pocs/views.py                  | 14 ++-
 6 files changed, 142 insertions(+), 5 deletions(-)
 create mode 100644 lms/djangoapps/pocs/migrations/0003_add_poc_membership_future_auto_enroll_flag.py

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index f990ca6060..8ec485a03a 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -1806,6 +1806,16 @@ def activate_account(request, key):
                 if cea.auto_enroll:
                     CourseEnrollment.enroll(student[0], cea.course_id)
 
+            # enroll student in any pending POCs he/she may have if auto_enroll flag is set
+            if settings.FEATURES.get('PERSONAL_ONLINE_COURSES'):
+                from pocs.models import PocMembership, PocFutureMembership
+                pfms = PocFutureMembership.objects.filter(
+                    email=student[0].email
+                )
+                for pfm in pfms:
+                    if pfm.auto_enroll:
+                        PocMembership.auto_enroll(student[0], pfm)
+
         resp = render_to_response(
             "registration/activation_complete.html",
             {
diff --git a/lms/djangoapps/pocs/migrations/0003_add_poc_membership_future_auto_enroll_flag.py b/lms/djangoapps/pocs/migrations/0003_add_poc_membership_future_auto_enroll_flag.py
new file mode 100644
index 0000000000..27e844371d
--- /dev/null
+++ b/lms/djangoapps/pocs/migrations/0003_add_poc_membership_future_auto_enroll_flag.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'PocFutureMembership.auto_enroll'
+        db.add_column('pocs_pocfuturemembership', 'auto_enroll',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'PocFutureMembership.auto_enroll'
+        db.delete_column('pocs_pocfuturemembership', 'auto_enroll')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'pocs.personalonlinecourse': {
+            'Meta': {'object_name': 'PersonalOnlineCourse'},
+            'coach': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'pocs.pocfieldoverride': {
+            'Meta': {'unique_together': "(('poc', 'location', 'field'),)", 'object_name': 'PocFieldOverride'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'pocs.pocfuturemembership': {
+            'Meta': {'object_name': 'PocFutureMembership'},
+            'auto_enroll': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'email': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"})
+        },
+        'pocs.pocmembership': {
+            'Meta': {'object_name': 'PocMembership'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['pocs']
\ No newline at end of file
diff --git a/lms/djangoapps/pocs/models.py b/lms/djangoapps/pocs/models.py
index da06a9fc7b..19ef31e4eb 100644
--- a/lms/djangoapps/pocs/models.py
+++ b/lms/djangoapps/pocs/models.py
@@ -1,6 +1,7 @@
 from django.contrib.auth.models import User
 from django.db import models
 
+from student.models import CourseEnrollment, AlreadyEnrolledError
 from xmodule_django.models import CourseKeyField, LocationKeyField
 
 
@@ -21,6 +22,20 @@ class PocMembership(models.Model):
     student = models.ForeignKey(User, db_index=True)
     active = models.BooleanField(default=False)
 
+    @classmethod
+    def auto_enroll(cls, student=None, future_membership=None):
+        assert student is not None and future_membership is not None
+        membership = cls(
+            poc=future_membership.poc, student=student, active=True
+        )
+        try:
+            CourseEnrollment.enroll(student, future_membership.poc.course_id)
+        except AlreadyEnrolledError:
+            pass
+        else:
+            membership.save()
+            future_membership.delete()
+
 
 class PocFutureMembership(models.Model):
     """
@@ -28,6 +43,7 @@ class PocFutureMembership(models.Model):
     """
     poc = models.ForeignKey(PersonalOnlineCourse, db_index=True)
     email = models.CharField(max_length=255)
+    auto_enroll = models.BooleanField(default=0)
 
 
 class PocFieldOverride(models.Model):
diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index bd6693328f..4f2edccffb 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -231,6 +231,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         data = {
             'enrollment-button': 'Enroll',
             'student-ids': u','.join([student.email, ]),
+            'email-students': 'Notify-students-by-email',
         }
         response = self.client.post(url, data=data, follow=True)
         self.assertEqual(response.status_code, 200)
@@ -263,6 +264,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         data = {
             'enrollment-button': 'Unenroll',
             'student-ids': u','.join([student.email, ]),
+            'email-students': 'Notify-students-by-email',
         }
         response = self.client.post(url, data=data, follow=True)
         self.assertEqual(response.status_code, 200)
@@ -292,6 +294,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         data = {
             'enrollment-button': 'Enroll',
             'student-ids': u','.join([test_email, ]),
+            'email-students': 'Notify-students-by-email',
         }
         response = self.client.post(url, data=data, follow=True)
         self.assertEqual(response.status_code, 200)
@@ -323,6 +326,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         data = {
             'enrollment-button': 'Unenroll',
             'student-ids': u','.join([test_email, ]),
+            'email-students': 'Notify-students-by-email',
         }
         response = self.client.post(url, data=data, follow=True)
         self.assertEqual(response.status_code, 200)
diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/pocs/utils.py
index f39017fcd3..9131c85342 100644
--- a/lms/djangoapps/pocs/utils.py
+++ b/lms/djangoapps/pocs/utils.py
@@ -65,7 +65,14 @@ def enroll_email(poc, student_email, auto_enroll=False, email_students=False, em
     if previous_state.user:
         if not previous_state.in_poc:
             user = User.objects.get(email=student_email)
-            membership = PocMembership(poc=poc, student=user)
+            membership = PocMembership(
+                poc=poc, student=user, active=True
+            )
+            membership.save()
+        elif auto_enroll:
+            # activate existing memberships
+            membership = PocMembership.objects.get(student=user, poc=poc)
+            membership.active = True
             membership.save()
         if email_students:
             email_params['message'] = 'enrolled_enroll'
@@ -73,7 +80,9 @@ def enroll_email(poc, student_email, auto_enroll=False, email_students=False, em
             email_params['full_name'] = previous_state.full_name
             send_mail_to_student(student_email, email_params)
     else:
-        membership = PocFutureMembership(poc=poc, email=student_email)
+        membership = PocFutureMembership(
+            poc=poc, auto_enroll=auto_enroll, email=student_email
+        )
         membership.save()
         if email_students:
             email_params['message'] = 'allowed_enroll'
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 964a79bc1d..62711aeb79 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -308,6 +308,8 @@ def poc_invite(request, course):
     action = request.POST.get('enrollment-button')
     identifiers_raw = request.POST.get('student-ids')
     identifiers = _split_input_list(identifiers_raw)
+    auto_enroll = True if 'auto-enroll' in request.POST else False
+    email_students = True if 'email-students' in request.POST else False
     for identifier in identifiers:
         user = None
         email = None
@@ -320,9 +322,14 @@ def poc_invite(request, course):
         try:
             validate_email(email)
             if action == 'Enroll':
-                enroll_email(poc, email, email_students=True)
+                enroll_email(
+                    poc,
+                    email,
+                    auto_enroll=auto_enroll,
+                    email_students=email_students
+                )
             if action == "Unenroll":
-                unenroll_email(poc, email, email_students=True)
+                unenroll_email(poc, email, email_students=email_students)
         except ValidationError:
             pass  # maybe log this?
     url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
@@ -350,7 +357,8 @@ def poc_student_management(request, course):
         validate_email(email)
         if action == 'add':
             # by decree, no emails sent to students added this way
-            enroll_email(poc, email, email_students=False)
+            # by decree, any students added this way are auto_enrolled
+            enroll_email(poc, email, auto_enroll=True, email_students=False)
         elif action == 'revoke':
             unenroll_email(poc, email, email_students=False)
     except ValidationError:

From 91aa7b06ceb3366254f32c2826532129b9ca639d Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Mon, 5 Jan 2015 00:13:01 -0600
Subject: [PATCH 16/29] MIT: CCX. Handle setting dates for blocks

Add date widget for setting start and due dates for the course sections, plus simple server side validation for avoiding db corruption from bad dates

Add immediate feedback for date validation errors
---
 lms/djangoapps/pocs/views.py            | 21 +++++++++++++++++++--
 lms/templates/pocs/coach_dashboard.html | 10 ++++++++++
 lms/templates/pocs/schedule.html        | 25 ++++++++++++++++++++++---
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 62711aeb79..5d4bd4fa32 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -231,6 +231,22 @@ def set_grading_policy(request, course):
     return redirect(url)
 
 
+def validate_date(year, month, day, hour, minute):
+    # avoid corrupting db if bad dates come in
+    valid = True
+    if year < 0:
+        valid = False
+    if month < 1 or month > 12:
+        valid = False
+    if day < 1 or day > 31:
+        valid = False
+    if hour < 0 or hour > 23:
+        valid = False
+    if minute < 0 or minute > 59:
+        valid = False
+    return valid
+
+
 def parse_date(datestring):
     """
     Generate a UTC datetime.datetime object from a string of the form
@@ -240,8 +256,9 @@ def parse_date(datestring):
         date, time = datestring.split(' ')
         year, month, day = map(int, date.split('-'))
         hour, minute = map(int, time.split(':'))
-        return datetime.datetime(
-            year, month, day, hour, minute, tzinfo=pytz.UTC)
+        if validate_date(year, month, day, hour, minute):
+            return datetime.datetime(
+                year, month, day, hour, minute, tzinfo=pytz.UTC)
 
     return None
 
diff --git a/lms/templates/pocs/coach_dashboard.html b/lms/templates/pocs/coach_dashboard.html
index 1fb6e8f6d8..7f19666e02 100644
--- a/lms/templates/pocs/coach_dashboard.html
+++ b/lms/templates/pocs/coach_dashboard.html
@@ -14,6 +14,16 @@
   <%static:css group='style-course'/>
 </%block>
 
+<%block name="jsextra">
+  <script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
+  <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
+  <style>
+    .ui-timepicker-list { z-index: 100000; }
+    .ui-datepicker { z-index: 100000 !important; }
+    input.date, input.time { width: auto !important; display: inline !important; }
+  </style>
+</%block>
+
 <%include file="/courseware/course_navigation.html" args="active_page='poc_coach'" />
 
 <section class="container">
diff --git a/lms/templates/pocs/schedule.html b/lms/templates/pocs/schedule.html
index 94788a7c6d..4e443a5c8a 100644
--- a/lms/templates/pocs/schedule.html
+++ b/lms/templates/pocs/schedule.html
@@ -70,10 +70,10 @@
       <h2></h2>
     </header>
     <form role="form">
-      <div class="field">
+      <div class="field" id="datepair">
         <label></label>
-        <input type="date" name="date"/>
-        <input type="time" name="time"/>
+        <input placeholder="Date" class="date" type="text" name="date"/ size="11">
+        <input placeholder="Time" class="time" type="text" name="time"/ size="6">
       </div>
       <div class="field">
         <button type="submit" class="btn btn-primary">${_('Set date')}</button>
@@ -138,6 +138,15 @@
 </div>
 
 <script>
+$('#datepair .time').timepicker({
+    'showDuration': true,
+    'timeFormat': 'G:i'
+});
+$('#datepair .date').datepicker({
+    'dateFormat': 'yy-mm-dd',
+    'autoclose': true
+});
+
 var poc_schedule = (function () {
   var save_url = '${save_url}';
   var schedule = ${schedule};
@@ -350,6 +359,16 @@ var poc_schedule = (function () {
         event.preventDefault();
         var date = $(this).find('input[name=date]').val(),
             time = $(this).find('input[name=time]').val();
+        var valid_date = new Date(date);
+        if (isNaN(valid_date.valueOf())) {
+          alert('Please enter a valid date');
+          return;
+        }
+        var valid_time = /^\d{1,2}:\d{2}?$/;
+        if (!time.match(valid_time)) {
+          alert('Please enter a valid time');
+          return;
+        }
         unit[what] = date + ' ' + time;
         modal.find('.close-modal').click();
         self.dirty = true;

From 6f1a2ed531068cef22c3097e7b72cbc685de571a Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Tue, 6 Jan 2015 10:42:17 -0800
Subject: [PATCH 17/29] MIT: CCX.  Fix issues identified in code review

Remove over-cautious assertion and allow calling errors to be calling errors

fix problems in auto_enroll method

ensure that the active poc is wiped out if the user has no poc membership
---
 lms/djangoapps/pocs/models.py    | 19 +++++++++++++------
 lms/djangoapps/pocs/overrides.py |  4 +++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/pocs/models.py b/lms/djangoapps/pocs/models.py
index 19ef31e4eb..1129d2f1cd 100644
--- a/lms/djangoapps/pocs/models.py
+++ b/lms/djangoapps/pocs/models.py
@@ -23,18 +23,25 @@ class PocMembership(models.Model):
     active = models.BooleanField(default=False)
 
     @classmethod
-    def auto_enroll(cls, student=None, future_membership=None):
-        assert student is not None and future_membership is not None
+    def auto_enroll(cls, student, future_membership):
+        """convert future_membership to an active membership
+        """
+        if not future_membership.auto_enroll:
+            msg = "auto enrollment not allowed for {}"
+            raise ValueError(msg.format(future_membership))
         membership = cls(
             poc=future_membership.poc, student=student, active=True
         )
         try:
-            CourseEnrollment.enroll(student, future_membership.poc.course_id)
+            CourseEnrollment.enroll(
+                student, future_membership.poc.course_id, check_access=True
+            )
         except AlreadyEnrolledError:
+            # if the user is already enrolled in the course, great!
             pass
-        else:
-            membership.save()
-            future_membership.delete()
+
+        membership.save()
+        future_membership.delete()
 
 
 class PocFutureMembership(models.Model):
diff --git a/lms/djangoapps/pocs/overrides.py b/lms/djangoapps/pocs/overrides.py
index bc2506165d..f93713dc7f 100644
--- a/lms/djangoapps/pocs/overrides.py
+++ b/lms/djangoapps/pocs/overrides.py
@@ -147,7 +147,9 @@ class PocMiddleware(object):
                 )
                 _POC_CONTEXT.poc = membership.poc
             except PocMembership.DoesNotExist:
-                pass
+                # if there is no membership, be sure to unset the active poc
+                _POC_CONTEXT.poc = None
+                request.session.pop(ACTIVE_POC_KEY)
 
     def process_response(self, request, response):
         """

From 96ca1da054fcc050adc0cde9c9150ee956e5948c Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Tue, 13 Jan 2015 10:45:55 -0800
Subject: [PATCH 18/29] MIT: CCX. Increase test coverage

Improve testing of views and utils

Test api methods added to models.
---
 lms/djangoapps/pocs/tests/test_models.py | 109 +++++++++++++++++++++++
 lms/djangoapps/pocs/tests/test_utils.py  |   4 +-
 lms/djangoapps/pocs/tests/test_views.py  |  23 +++++
 3 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 lms/djangoapps/pocs/tests/test_models.py

diff --git a/lms/djangoapps/pocs/tests/test_models.py b/lms/djangoapps/pocs/tests/test_models.py
new file mode 100644
index 0000000000..b12303fae2
--- /dev/null
+++ b/lms/djangoapps/pocs/tests/test_models.py
@@ -0,0 +1,109 @@
+from student.models import CourseEnrollment
+from student.roles import CoursePocCoachRole
+from student.tests.factories import (
+    AdminFactory,
+    CourseEnrollmentFactory,
+    UserFactory,
+)
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+
+from .factories import (
+    PocFactory,
+    PocMembershipFactory,
+    PocFutureMembershipFactory,
+)
+from ..models import (
+    PocMembership,
+    PocFutureMembership,
+)
+
+
+class TestPocMembership(ModuleStoreTestCase):
+    """Unit tests for the PocMembership model
+    """
+
+    def setUp(self):
+        """common setup for all tests"""
+        self.course = course = CourseFactory.create()
+        coach = AdminFactory.create()
+        role = CoursePocCoachRole(course.id)
+        role.add_users(coach)
+        self.poc = PocFactory(course_id=course.id, coach=coach)
+        enrollment = CourseEnrollmentFactory.create(course_id=course.id)
+        self.enrolled_user = enrollment.user
+        self.unenrolled_user = UserFactory.create()
+
+    def create_future_enrollment(self, user, auto_enroll=True):
+        pfm = PocFutureMembershipFactory.create(
+            poc=self.poc,
+            email=user.email,
+            auto_enroll=auto_enroll
+        )
+        return pfm
+
+    def has_course_enrollment(self, user):
+        enrollment = CourseEnrollment.objects.filter(
+            user=user, course_id=self.course.id
+        )
+        return enrollment.exists()
+
+    def has_poc_membership(self, user):
+        membership = PocMembership.objects.filter(
+            student=user, poc=self.poc, active=True
+        )
+        return membership.exists()
+
+    def has_poc_future_membership(self, user):
+        future_membership = PocFutureMembership.objects.filter(
+            email=user.email, poc=self.poc
+        )
+        return future_membership.exists()
+
+    def call_MUT(self, student, future_membership):
+        PocMembership.auto_enroll(student, future_membership)
+
+    def test_poc_auto_enroll_unregistered_user(self):
+        """verify auto_enroll works when user is not enrolled in the MOOC
+
+        n.b.  After auto_enroll, user will have both a MOOC enrollment and a
+              POC membership
+        """
+        user = self.unenrolled_user
+        pfm = self.create_future_enrollment(user)
+        self.assertTrue(self.has_poc_future_membership(user))
+        self.assertFalse(self.has_course_enrollment(user))
+        # auto_enroll user
+        self.call_MUT(user, pfm)
+
+        self.assertTrue(self.has_course_enrollment(user))
+        self.assertTrue(self.has_poc_membership(user))
+        self.assertFalse(self.has_poc_future_membership(user))
+
+    def test_poc_auto_enroll_registered_user(self):
+        """verify auto_enroll works when user is enrolled in the MOOC
+        """
+        user = self.enrolled_user
+        pfm = self.create_future_enrollment(user)
+        self.assertTrue(self.has_poc_future_membership(user))
+        self.assertTrue(self.has_course_enrollment(user))
+
+        self.call_MUT(user, pfm)
+
+        self.assertTrue(self.has_course_enrollment(user))
+        self.assertTrue(self.has_poc_membership(user))
+        self.assertFalse(self.has_poc_future_membership(user))
+
+    def test_future_membership_disallows_auto_enroll(self):
+        """verify that the PocFutureMembership can veto auto_enroll
+        """
+        user = self.unenrolled_user
+        pfm = self.create_future_enrollment(user, auto_enroll=False)
+        self.assertTrue(self.has_poc_future_membership(user))
+        self.assertFalse(self.has_course_enrollment(user))
+
+        self.assertRaises(ValueError, self.call_MUT, user, pfm)
+
+        self.assertFalse(self.has_course_enrollment(user))
+        self.assertFalse(self.has_poc_membership(user))
+        self.assertTrue(self.has_poc_future_membership(user))
diff --git a/lms/djangoapps/pocs/tests/test_utils.py b/lms/djangoapps/pocs/tests/test_utils.py
index 242c5b98cd..148f75a377 100644
--- a/lms/djangoapps/pocs/tests/test_utils.py
+++ b/lms/djangoapps/pocs/tests/test_utils.py
@@ -544,5 +544,5 @@ class TestUserPocList(ModuleStoreTestCase):
         # all parts of the poc url are present
         for part in url_parts:
             self.assertTrue(part in this_membership['poc_url'])
-        actual_name = self.get_course_title()
-        self.assertTrue(actual_name in this_membership['poc_name'])
+        actual_name = self.poc.display_name
+        self.assertEqual(actual_name, this_membership['poc_name'])
diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/pocs/tests/test_views.py
index 4f2edccffb..47cb356f93 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/pocs/tests/test_views.py
@@ -564,6 +564,13 @@ class TestSwitchActivePoc(ModuleStoreTestCase, LoginEnrollmentTestCase):
         """
         PocMembershipFactory(poc=self.poc, student=self.user, active=active)
 
+    def revoke_poc_registration(self):
+        from ..models import PocMembership
+        membership = PocMembership.objects.filter(
+            poc=self.poc, student=self.user
+        )
+        membership.delete()
+
     def verify_active_poc(self, request, id=None):
         if id:
             id = str(id)
@@ -689,6 +696,22 @@ class TestSwitchActivePoc(ModuleStoreTestCase, LoginEnrollmentTestCase):
         # switched back to the mooc view
         self.verify_active_poc(self.client)
 
+    def test_revoking_poc_membership_revokes_active_poc(self):
+        self.register_user_in_poc(active=True)
+        self.client.login(username=self.user.username, password="test")
+        # ensure poc is active in the request session
+        switch_url = reverse(
+            'switch_active_poc',
+            args=[self.course.id.to_deprecated_string(), self.poc.id]
+        )
+        self.client.get(switch_url)
+        self.verify_active_poc(self.client, self.poc.id)
+        # unenroll the user from the poc
+        self.revoke_poc_registration()
+        # request the course root and verify that the poc is not active
+        self.client.get(self.target_url)
+        self.verify_active_poc(self.client)
+
 
 def flatten(seq):
     """

From bb7eed58db876247d4713ad188e89399c9ac4163 Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Wed, 14 Jan 2015 12:54:48 -0600
Subject: [PATCH 19/29] MIT: CCX. Refactore using backbone.js

---
 lms/djangoapps/pocs/views.py            |  10 +
 lms/envs/common.py                      |   6 +
 lms/static/js/pocs/schedule.js          | 490 +++++++++++++++++++++++
 lms/templates/pocs/coach_dashboard.html |  11 -
 lms/templates/pocs/schedule.html        | 497 +++---------------------
 lms/templates/pocs/schedule.underscore  |  52 +++
 lms/urls.py                             |   2 +
 7 files changed, 609 insertions(+), 459 deletions(-)
 create mode 100644 lms/static/js/pocs/schedule.js
 create mode 100644 lms/templates/pocs/schedule.underscore

diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/pocs/views.py
index 5d4bd4fa32..81d911f201 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/pocs/views.py
@@ -314,6 +314,16 @@ def get_poc_schedule(course, poc):
         return tuple(visit(course))
 
 
+@ensure_csrf_cookie
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@coach_dashboard
+def poc_schedule(request, course):
+    poc = get_poc_for_coach(course, request.user)
+    schedule = get_poc_schedule(course, poc)
+    json_schedule = json.dumps(schedule, indent=4)
+    return HttpResponse(json_schedule, mimetype='application/json')
+
+
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 36271ee723..edd74796b5 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1203,6 +1203,8 @@ reverify_js = [
     'js/verify_student/incourse_reverify.js',
 ]
 
+pocs_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'js/pocs/**/*.js'))
+
 PIPELINE_CSS = {
     'style-vendor': {
         'source_filenames': [
@@ -1396,6 +1398,10 @@ PIPELINE_JS = {
     'reverify': {
         'source_filenames': reverify_js,
         'output_filename': 'js/reverify.js'
+    },
+    'pocs': {
+        'source_filenames': pocs_js,
+        'output_filename': 'js/pocs.js'
     }
 }
 
diff --git a/lms/static/js/pocs/schedule.js b/lms/static/js/pocs/schedule.js
new file mode 100644
index 0000000000..9e168dd867
--- /dev/null
+++ b/lms/static/js/pocs/schedule.js
@@ -0,0 +1,490 @@
+var edx = edx || {};
+
+(function($, _, Backbone, gettext) {
+    'use strict';
+
+    edx.pocs = edx.pocs || {};
+    edx.pocs.schedule = edx.pocs.schedule || {};
+
+    var syncErrorMessage = gettext("The data could not be saved.");
+
+    var self;
+
+    edx.pocs.schedule.reloadPage = function() {
+        location.reload();
+    };
+
+    edx.pocs.schedule.UnitModel = Backbone.Model.extend({
+        defaults: {
+            location: '',
+            display_name: '',
+            start: null,
+            due: null,
+            category: '',
+            hidden: false,
+            children: []
+        },
+
+    });
+
+    edx.pocs.schedule.Schedule = Backbone.Collection.extend({
+
+        model: edx.pocs.schedule.UnitModel,
+        url: 'poc_schedule'
+
+    });
+
+    edx.pocs.schedule.ScheduleView = Backbone.View.extend({
+
+        initialize: function() {
+            _.bindAll(this, 'render');
+	    this.schedule_collection = new edx.pocs.schedule.Schedule();
+	    this.schedule = {};
+	    this.schedule_collection.bind('reset', this.render);
+	    this.schedule_collection.fetch({reset: true});
+            this.chapter_select = $('form#add-unit select[name="chapter"]'),
+            this.sequential_select = $('form#add-unit select[name="sequential"]'),
+            this.vertical_select = $('form#add-unit select[name="vertical"]');
+            this.dirty = false;
+	    self = this;
+	    $('#add-all').on('click', function(event) {
+	        event.preventDefault();
+	        this.schedule_apply(self.schedule, show);
+	        self.dirty = true;
+	        self.render();
+	    });
+        },
+
+        render: function() {
+	    this.schedule = this.schedule_collection.toJSON();
+            this.hidden = this.pruned(this.schedule, function(node) {
+              return node.hidden || node.category !== 'vertical'});
+            this.showing = this.pruned(this.schedule, function(node) {
+              return !node.hidden});
+            this.$el.html(schedule_template({chapters: this.showing}));
+            $('table.poc-schedule .sequential,.vertical').hide();
+            $('table.poc-schedule .toggle-collapse').on('click', this.toggle_collapse);
+	    //
+	    // Hidden hover fields for empty date fields
+	    $('table.poc-schedule .date a').each(function() {
+	      if (! $(this).text()) {
+		$(this).text('Set date').addClass('empty');
+	      }
+	    });
+	    
+	    // Handle date edit clicks
+	    $('table.poc-schedule .date a').attr('href', '#enter-date-modal')
+	      .leanModal({closeButton: '.close-modal'});
+	    $('table.poc-schedule .due-date a').on('click', this.enterNewDate('due'));
+	    $('table.poc-schedule .start-date a').on('click', this.enterNewDate('start'));
+	    // Click handler for remove all
+	    $('table.poc-schedule a#remove-all').on('click', function(event) {
+	      event.preventDefault();
+	      this.schedule_apply(self.schedule, hide);
+	      self.dirty = true;
+	      self.render();
+	    });
+
+	    // Show or hide form
+	    if (this.hidden.length) {
+	      // Populate chapters select, depopulate others
+	      this.chapter_select.html('')
+		.append('<option value="none">'+gettext("Select a chapter")+'...</option>')
+		.append(this.schedule_options(this.hidden));
+	      this.sequential_select.html('').prop('disabled', true);
+	      this.vertical_select.html('').prop('disabled', true);
+	      $('form#add-unit').show();
+	      $('#all-units-added').hide();
+	      $('#add-unit-button').prop('disabled', true);
+	    }
+	    else {
+	      $('form#add-unit').hide();
+	      $('#all-units-added').show();
+	    }
+
+	    // Add unit handlers
+	    this.chapter_select.on('change', function(event) {
+	      var chapter_location = self.chapter_select.val();
+	      self.vertical_select.html('').prop('disabled', true);
+	      if (chapter_location !== 'none') {
+		var chapter = self.find_unit(self.hidden, chapter_location);
+		self.sequential_select.html('')
+		  .append('<option value="all">'+gettext("All subsections")+'</option>')
+		  .append(self.schedule_options(chapter.children));
+		self.sequential_select.prop('disabled', false);
+		$('#add-unit-button').prop('disabled', false);
+		self.set_datetime('start', chapter.start);
+		self.set_datetime('due', chapter.due);
+	      }
+	      else {
+		self.sequential_select.html('').prop('disabled', true);
+	      }
+	    });
+
+	    this.sequential_select.on('change', function(event) {
+	      var sequential_location = self.sequential_select.val();
+	      if (sequential_location !== 'all') {
+		var chapter = self.chapter_select.val();
+		sequential = self.find_unit(self.hidden, chapter, sequential_location);
+		self.vertical_select.html('')
+		  .append('<option value="all">'+gettext("All units")+'</option>')
+		  .append(schedule_options(sequential.children));
+		self.vertical_select.prop('disabled', false);
+		self.set_datetime('start', sequential.start);
+		self.set_datetime('due', sequential.due);
+	      }
+	      else {
+		self.vertical_select.html('').prop('disabled', true);
+	      } 
+	    });
+	    
+	    this.vertical_select.on('change', function(event) {
+	      var vertical_location = self.vertical_select.val();
+	      if (vertical_location !== 'all') {
+		var chapter = chapter_select.val(),
+		    sequential = self.sequential_select.val();
+		vertical = self.find_unit(
+		  self.hidden, chapter, sequential, vertical_location);
+		self.set_datetime('start', vertical.start);
+		self.set_datetime('due', vertical.due);
+	      }
+	    });
+
+	    // Add unit handler
+	    $('#add-unit-button').on('click', function(event) {
+	      event.preventDefault();
+	      var chapter = self.chapter_select.val(),
+		  sequential = self.sequential_select.val(),
+		  vertical = self.vertical_select.val(),
+		  units = self.find_lineage(self.schedule,
+		    chapter,
+		    sequential == 'all' ? null : sequential,
+		    vertical == 'all' ? null: vertical),
+		  start = self.get_datetime('start'),
+		  due = self.get_datetime('due');
+	      units.map(show);
+	      unit = units[units.length - 1]
+	      self.schedule_apply([unit], show);      
+	      if (start) unit.start = start;
+	      if (due) unit.due = due;
+	      self.dirty = true;
+	      self.render();
+	    });
+
+	    // Remove unit handler
+	    $('table.poc-schedule a.remove-unit').on('click', function(event) {
+	      var row = $(this).closest('tr'),
+		  path = row.data('location').split(' '),
+		  unit = self.find_unit(self.schedule, path[0], path[1], path[2]);
+	      self.schedule_apply([unit], self.hide);
+	      self.dirty = true;
+	      self.render(); 
+	    });
+
+	    // Show or hide save button
+	    if (this.dirty) $('#dirty-schedule').show()
+	    else $('#dirty-schedule').hide();
+
+	    // Handle save button
+	    $('#dirty-schedule #save-changes').on('click', function(event) {
+		event.preventDefault();
+		self.save();
+	    });
+
+	    $('#ajax-error').hide();
+
+	    return this;
+	},
+
+	save: function() {
+	    var button = $('#dirty-schedule #save-changes');
+	    button.prop('disabled', true).text(gettext("Saving")+'...');
+	    
+	    $.ajax({
+		url: save_url,
+		type: 'POST',
+		contentType: 'application/json',
+		data: JSON.stringify(this.schedule),
+		success: function(data, textStatus, jqXHR) {
+		  self.schedule = data.schedule;
+		  self.dirty = false;
+		  self.render();
+		  button.prop('disabled', false).text(gettext("Save changes"));
+		  
+		  // Update textarea with grading policy JSON, since grading policy
+		  // may have changed.  
+		  $('#grading-policy').text(data.grading_policy);
+		},
+		error: function(jqXHR, textStatus, error) {
+		  console.log(jqXHR.responseText);
+		  $('#ajax-error').show();
+		  $('#dirty-schedule').hide();
+		  $('form#add-unit select,input,button').prop('disabled', true);
+		}
+	      });
+	},
+
+	hide: function(unit) {
+	    unit.hidden = true;
+	},
+
+        show: function(unit) {
+	    unit.hidden = false;
+	},
+
+	get_datetime: function(which) {
+	    var date = $('form#add-unit input[name=' + which + '_date]').val();
+	    var time = $('form#add-unit input[name=' + which + '_time]').val();
+	    if (date && time)
+	      return date + ' ' + time;
+	    return null;
+	},
+
+	set_datetime: function(which, value) {
+	    var parts = value ? value.split(' ') : ['', ''],
+		date = parts[0],
+		time = parts[1];
+	    $('form#add-unit input[name=' + which + '_date]').val(date);
+	    $('form#add-unit input[name=' + which + '_time]').val(time);
+	},
+
+	schedule_options: function(nodes) {
+	    return nodes.map(function(node) {
+	      return $('<option>')
+		.attr('value', node.location)
+		.text(node.display_name)[0];
+	    });
+	},
+
+	schedule_apply: function(nodes, f) {
+	    nodes.map(function(node) {
+	      f(node);
+	      if (node.children !== undefined) self.schedule_apply(node.children, f);
+	    });
+	},
+
+	pruned: function(tree, filter) {
+	    return tree.filter(filter)
+	      .map(function(node) {
+		var copy = {};
+		$.extend(copy, node);
+		if (node.children) copy.children = self.pruned(node.children, filter);
+		return copy;
+	      })
+	      .filter(function(node) {
+		return node.children === undefined || node.children.length;
+	      });
+	},
+
+	toggle_collapse: function(event) {
+	    event.preventDefault();
+	    var row = $(this).closest('tr');
+	    var children = self.get_children(row);
+
+	    if (row.is('.expanded')) {
+	      $(this).removeClass('icon-caret-down').addClass('icon-caret-right');
+	      row.removeClass('expanded').addClass('collapsed');
+	      children.hide(); 
+	    }
+
+	    else {
+	      $(this).removeClass('icon-caret-right').addClass('icon-caret-down');
+	      row.removeClass('collapsed').addClass('expanded');
+	      children.filter('.collapsed').each(function() {
+		children = children.not(self.get_children(this));
+	      });
+	      children.show(); 
+	    }
+	},
+
+	enterNewDate: function(what) {
+	    return function(event) {
+	      var row = $(this).closest('tr');
+	      var modal = $('#enter-date-modal')
+		.data('what', what)
+		.data('location', row.data('location'));
+	      modal.find('h2').text(
+		  what == 'due' ? gettext("Enter Due Date") : 
+		      gettext("Enter Start Date"));
+	      modal.find('label').text(row.find('td:first').text());
+
+	      var path = row.data('location').split(' '),
+		  unit = self.find_unit(self.schedule, path[0], path[1], path[2]),
+		  parts = unit[what] ? unit[what].split(' ') : ['', ''],
+		  date = parts[0],
+		  time = parts[1];
+
+	      modal.find('input[name=date]').val(date);
+	      modal.find('input[name=time]').val(time);
+
+	      modal.find('form').off('submit').on('submit', function(event) {
+		event.preventDefault();
+		var date = $(this).find('input[name=date]').val(),
+		    time = $(this).find('input[name=time]').val();
+		var valid_date = new Date(date);
+		if (isNaN(valid_date.valueOf())) {
+		  alert('Please enter a valid date');
+		  return;
+		}
+		var valid_time = /^\d{1,2}:\d{2}?$/;
+		if (!time.match(valid_time)) {
+		  alert('Please enter a valid time');
+		  return;
+		}
+		unit[what] = date + ' ' + time;
+		modal.find('.close-modal').click();
+		self.dirty = true;
+		self.render();
+	      });
+	    }
+	},
+
+	find_unit: function(tree, chapter, sequential, vertical) {
+	    var units = self.find_lineage(tree, chapter, sequential, vertical);
+	    return units[units.length -1];
+	},
+
+	find_lineage: function(tree, chapter, sequential, vertical) {
+	    function find_in(seq, location) {
+	      for (var i = 0; i < seq.length; i++)
+		if (seq[i].location === location)
+		  return seq[i];
+	    }
+
+	    var units = [],
+		unit = find_in(tree, chapter);
+	    units[units.length] = unit;
+	    if (sequential) {
+	      units[units.length] = unit = find_in(unit.children, sequential);
+	      if (vertical) 
+		units[units.length] = unit = find_in(unit.children, vertical);
+	    }
+
+	    return units;
+	},
+
+	get_children: function(row) {
+	    var depth = $(row).data('depth');
+	    return $(row).nextUntil(
+	      $(row).siblings().filter(function() {
+		return $(this).data('depth') <= depth;
+	      })
+	    );
+	}
+
+    });
+
+	    edx.pocs.schedule.XScheduleView = Backbone.View.extend({
+
+		events: {
+		    'submit': 'submit',
+		    'change': 'change'
+		},
+
+		initialize: function() {
+		    _.bindAll(this, 'render', 'change', 'submit', 'invalidProfile', 'invalidPreference', 'error', 'sync', 'clearStatus');
+		    
+		    this.scheduleModel = new edx.pocs.schedule.ProfileModel();
+		    this.scheduleModel.on('invalid', this.invalidProfile);
+		    this.scheduleModel.on('error', this.error);
+		    this.scheduleModel.on('sync', this.sync);
+
+		    this.preferencesModel = new edx.pocs.schedule.PreferencesModel();
+		    this.preferencesModel.on('invalid', this.invalidPreference);
+		    this.preferencesModel.on('error', this.error);
+		    this.preferencesModel.on('sync', this.sync);
+		},
+
+		render: function() {
+		    this.$el.html(_.template($('#schedule-tpl').html()));
+
+		    this.$nameField = $('#schedule-name', this.$el);
+		    this.$nameStatus = $('#schedule-name-status', this.$el);
+		    
+		    this.$languageChoices = $('#preference-language', this.$el);
+		    this.$languageStatus = $('#preference-language-status', this.$el);
+
+		    this.$submitStatus = $('#submit-status', this.$el);
+
+		    var self = this;
+		    $.getJSON('preferences/languages')
+			.done(function(json) {
+			    /** Asynchronously populate the language choices. */
+			    self.$languageChoices.html(_.template($('#languages-tpl').html(), {languageInfo: json}));
+			})
+			.fail(function() {
+			    self.$languageStatus
+				.addClass('language-list-error')
+				.text(gettext("We couldn't populate the list of language choices."));
+			});
+
+		    return this;
+		},
+
+		change: function() {
+		    this.scheduleModel.set({
+			fullName: this.$nameField.val()
+		    });
+
+		    this.preferencesModel.set({
+			language: this.$languageChoices.val()
+		    });
+		},
+
+		submit: function(event) {
+		    event.preventDefault();
+		    this.clearStatus();
+		    this.scheduleModel.save();
+		    this.preferencesModel.save();
+		},
+
+		invalidProfile: function(model) {
+		    var errors = model.validationError;
+		    if (errors.hasOwnProperty('fullName')) {
+			this.$nameStatus
+			    .addClass('validation-error')
+			    .text(errors.fullName);
+		    }
+		},
+
+		invalidPreference: function(model) {
+		    var errors = model.validationError;
+		    if (errors.hasOwnProperty('language')) {
+			this.$languageStatus
+			    .addClass('validation-error')
+			    .text(errors.language);
+		    }
+		},
+
+		error: function(error) {
+		    this.$submitStatus
+			.addClass('error')
+			.text(error);
+		},
+
+		sync: function() {
+		    this.$submitStatus
+			.addClass('success')
+			.text(gettext("Saved"));
+		},
+
+		clearStatus: function() {
+		    this.$nameStatus
+			.removeClass('validation-error')
+			.text("");
+
+		    this.$languageStatus
+			.removeClass('validation-error')
+			.text("");
+
+		    this.$submitStatus
+			.removeClass('error')
+			.text("");
+		}
+	    });
+
+	})(jQuery, _, Backbone, gettext);
+
+
+
+
diff --git a/lms/templates/pocs/coach_dashboard.html b/lms/templates/pocs/coach_dashboard.html
index 7f19666e02..136c73bed4 100644
--- a/lms/templates/pocs/coach_dashboard.html
+++ b/lms/templates/pocs/coach_dashboard.html
@@ -14,16 +14,6 @@
   <%static:css group='style-course'/>
 </%block>
 
-<%block name="jsextra">
-  <script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
-  <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
-  <style>
-    .ui-timepicker-list { z-index: 100000; }
-    .ui-datepicker { z-index: 100000 !important; }
-    input.date, input.time { width: auto !important; display: inline !important; }
-  </style>
-</%block>
-
 <%include file="/courseware/course_navigation.html" args="active_page='poc_coach'" />
 
 <section class="container">
@@ -148,5 +138,4 @@
   $(setup_tabs);
   $(setup_management_form)
 
-
 </script>
diff --git a/lms/templates/pocs/schedule.html b/lms/templates/pocs/schedule.html
index 4e443a5c8a..18e8f5c652 100644
--- a/lms/templates/pocs/schedule.html
+++ b/lms/templates/pocs/schedule.html
@@ -1,61 +1,32 @@
 <%! from django.utils.translation import ugettext as _ %>
 
-<script id="poc-schedule-template" type="text/x-handlerbars-template">
-  <table class="poc-schedule">
-    <thead>
-      <tr>
-        <th>${_('Unit')}</th>
-        <th>${_('Start Date')}</th>
-        <th>${_('Due Date')}</th>
-        <th><a href="#" id="remove-all">
-          <i class="icon-remove-sign icon"></i> ${_('remove all')}
-        </a></th>
-      </tr>
-    </thead>
-    <tbody>
-      {{#each chapters}}
-        <tr class="chapter collapsed" data-location="{{location}}" data-depth="1">
-          <td class="unit">
-            <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a> 
-            {{display_name}}
-          </td>
-          <td class="date start-date"><a>{{start}}</a></td>
-          <td class="date due-date"><a>{{due}}</a></td>
-          <td><a href="#" class="remove-unit">
-            <i class="icon-remove-sign icon"></i> ${_('remove')}
-          </a></td>
-        </tr>
-        {{#each children}}
-          <tr class="sequential collapsed" data-depth="2" 
-              data-location="{{../location}} {{location}}">
-            <td class="unit">
-              <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a> 
-              {{display_name}}
-            </td>
-            <td class="date start-date"><a>{{start}}</a></td>
-            <td class="date due-date"><a>{{due}}</a></td>
-            <td><a href="#" class="remove-unit">
-              <i class="icon-remove-sign icon"></i> ${_('remove')}
-            </a></td>
-          </tr>
-          {{#each children}}
-            <tr class="vertical" data-dapth="3"
-                data-location="{{../../location}} {{../location}} {{location}}">
-              <td class="unit">&nbsp;{{display_name}}</td>
-              <td class="date start-date"><a>{{start}}</a></td>
-              <td class="date due-date"><a>{{due}}</a></td>
-              <td><a href="#" class="remove-unit">
-                <i class="icon-remove-sign icon"></i> ${_('remove')}
-              </a></td>
-          {{/each}}
-        {{/each}}
-      {{/each}}
-    </tbody>
-  </table>
-</script>
+<%namespace name='static' file='/static_content.html'/>
+
+<%block name="jsextra">
+  <script>  
+    var save_url = '${save_url}';
+    var schedule = ${schedule};
+  </script>
+    <script src="${static.url('js/vendor/backbone-min.js')}"></script>
+  <script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
+  <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
+  <style>
+    .ui-timepicker-list { z-index: 100000; }
+    .ui-datepicker { z-index: 100000 !important; }
+    input.date, input.time { width: auto !important; display: inline !important; }
+  </style>
+  <%static:js group='pocs'/>
+</%block>
+
+%for template_name in ["schedule"]:
+  <script type="text/template" id="poc-${template_name}-template">
+    <%static:include path="pocs/${template_name}.underscore" />
+  </script>
+%endfor
 
 <div class="poc-schedule-container">
   <div id="poc-schedule"></div>
+  <div id="new-poc-schedule"></div>
 </div>
 
 <section id="enter-date-modal" class="modal" aria-hidden="true">
@@ -70,7 +41,7 @@
       <h2></h2>
     </header>
     <form role="form">
-      <div class="field" id="datepair">
+      <div class="field datepair">
         <label></label>
         <input placeholder="Date" class="date" type="text" name="date"/ size="11">
         <input placeholder="Time" class="time" type="text" name="time"/ size="6">
@@ -101,26 +72,26 @@
     <h2>${_('Schedule a Unit')}</h2>
     <form role="form" id="add-unit" name="add-unit" class="poc-form">
       <div class="field">
-        <b>${_('Chapter')}</b><br/>
+        <b>${_('Section')}</b><br/>
         <select name="chapter"></select>
       </div>
       <div class="field">
-        <b>${_('Sequential')}</b><br/>
+        <b>${_('Subsection')}</b><br/>
         <select name="sequential"></select>
       </div>
       <div class="field">
-        <b>${_('Vertical')}</b><br/>
+        <b>${_('Unit')}</b><br/>
         <select name="vertical"></select>
       </div>
-      <div class="field">
+      <div class="field datepair">
         <b>${_('Start Date')}</b><br/>
-        <input type="date" name="start_date"/>
-        <input type="time" name="start_time"/>
+        <input placeholder="Date" type="date" class="date" name="start_date"/>
+        <input placeholder="time" type="time" class="time" name="start_time"/>
       </div>
-      <div class="field">
+      <div class="field datepair">
         <b>${_('Due Date')}</b> ${_('(Optional)')}<br/>
-        <input type="date" name="due_date"/>
-        <input type="time" name="due_time"/>
+        <input placeholder="Date" type="date" class="date" name="due_date"/>
+        <input placeholder="time" type="time" class="time" name="due_time"/>
       </div>
       <div class="field">
         <br/>
@@ -138,390 +109,20 @@
 </div>
 
 <script>
-$('#datepair .time').timepicker({
-    'showDuration': true,
-    'timeFormat': 'G:i'
+$(function() {
+    schedule_template = _.template($('#poc-schedule-template').html());
+    var view = new edx.pocs.schedule.ScheduleView({
+        el: $('#new-poc-schedule')
+    });
+    view.render();
+    //poc_schedule.render();
+    $('.datepair .time').timepicker({
+        'showDuration': true,
+        'timeFormat': 'G:i'
+    });
+    $('.datepair .date').datepicker({
+        'dateFormat': 'yy-mm-dd',
+        'autoclose': true
+    });
 });
-$('#datepair .date').datepicker({
-    'dateFormat': 'yy-mm-dd',
-    'autoclose': true
-});
-
-var poc_schedule = (function () {
-  var save_url = '${save_url}';
-  var schedule = ${schedule};
-  var template = Handlebars.compile($('#poc-schedule-template').html());
-  var chapter_select = $('form#add-unit select[name="chapter"]'),
-      sequential_select = $('form#add-unit select[name="sequential"]'),
-      vertical_select = $('form#add-unit select[name="vertical"]');
-
-  var self = {
-    schedule: schedule,
-    dirty: false
-  };
-
-  function hide(unit) {
-    unit.hidden = true;
-  }
-
-  function show(unit) {
-    unit.hidden = false;
-  }
-
-  function get_datetime(which) {
-    var date = $('form#add-unit input[name=' + which + '_date]').val();
-    var time = $('form#add-unit input[name=' + which + '_time]').val();
-    if (date && time)
-      return date + ' ' + time;
-    return null;
-  }
-
-  function set_datetime(which, value) {
-    var parts = value ? value.split(' ') : ['', ''],
-        date = parts[0],
-        time = parts[1];
-    $('form#add-unit input[name=' + which + '_date]').val(date);
-    $('form#add-unit input[name=' + which + '_time]').val(time);
-  }
-
-  /**
-   * Render the course tree view.
-   */
-  self.render = function() {
-    this.hidden = pruned(this.schedule, function(node) {
-      return node.hidden || node.category !== 'vertical'});
-    this.showing = pruned(this.schedule, function(node) {
-      return !node.hidden});
-
-    // Render template
-    $('#poc-schedule').html(template({chapters: this.showing}));
-
-    // Start collapsed
-    $('table.poc-schedule .sequential,.vertical').hide();
-
-    // Click handlers for collapsible tree
-    $('table.poc-schedule .toggle-collapse').on('click', toggle_collapse);
-
-    // Hidden hover fields for empty date fields
-    $('table.poc-schedule .date a').each(function() {
-      if (! $(this).text()) {
-        $(this).text('Set date').addClass('empty');
-      }
-    });
-    
-    // Handle date edit clicks
-    $('table.poc-schedule .date a').attr('href', '#enter-date-modal')
-      .leanModal({closeButton: '.close-modal'});
-    $('table.poc-schedule .due-date a').on('click', enterNewDate('due'));
-    $('table.poc-schedule .start-date a').on('click', enterNewDate('start'));
-
-    // Click handler for remove all
-    $('table.poc-schedule a#remove-all').on('click', function(event) {
-      event.preventDefault();
-      schedule_apply(self.schedule, hide);
-      self.dirty = true;
-      self.render();
-    });
-
-    // Show or hide form
-    if (this.hidden.length) {
-      // Populate chapters select, depopulate others
-      chapter_select.html('')
-        .append('<option value="none">${_("Select a chapter")}...</option>')
-        .append(schedule_options(this.hidden));
-      sequential_select.html('').prop('disabled', true);
-      vertical_select.html('').prop('disabled', true);
-      $('form#add-unit').show();
-      $('#all-units-added').hide();
-      $('#add-unit-button').prop('disabled', true);
-    }
-    else {
-      $('form#add-unit').hide();
-      $('#all-units-added').show();
-    }
-
-    // Add unit handlers
-    chapter_select.on('change', function(event) {
-      var chapter_location = chapter_select.val();
-      vertical_select.html('').prop('disabled', true);
-      if (chapter_location !== 'none') {
-        chapter = find_unit(self.hidden, chapter_location);
-        sequential_select.html('')
-          .append('<option value="all">${_("All sequentials")}</option>')
-          .append(schedule_options(chapter.children));
-        sequential_select.prop('disabled', false);
-        $('#add-unit-button').prop('disabled', false);
-        set_datetime('start', chapter.start);
-        set_datetime('due', chapter.due);
-      }
-      else {
-        sequential_select.html('').prop('disabled', true);
-      }
-    });
-
-    sequential_select.on('change', function(event) {
-      var sequential_location = sequential_select.val();
-      if (sequential_location !== 'all') {
-        var chapter = chapter_select.val();
-        sequential = find_unit(self.hidden, chapter, sequential_location);
-        vertical_select.html('')
-          .append('<option value="all">${_("All verticals")}</option>')
-          .append(schedule_options(sequential.children));
-        vertical_select.prop('disabled', false);
-        set_datetime('start', sequential.start);
-        set_datetime('due', sequential.due);
-      }
-      else {
-        vertical_select.html('').prop('disabled', true);
-      } 
-    });
-    
-    vertical_select.on('change', function(event) {
-      var vertical_location = vertical_select.val();
-      if (vertical_location !== 'all') {
-        var chapter = chapter_select.val(),
-            sequential = sequential_select.val();
-        vertical = find_unit(
-          self.hidden, chapter, sequential, vertical_location);
-        set_datetime('start', vertical.start);
-        set_datetime('due', vertical.due);
-      }
-    });
-
-    // Add unit handler
-    $('#add-unit-button').on('click', function(event) {
-      event.preventDefault();
-      var chapter = chapter_select.val(),
-          sequential = sequential_select.val(),
-          vertical = vertical_select.val(),
-          units = find_lineage(self.schedule,
-            chapter,
-            sequential == 'all' ? null : sequential,
-            vertical == 'all' ? null: vertical),
-          start = get_datetime('start'),
-          due = get_datetime('due');
-      units.map(show);
-      unit = units[units.length - 1]
-      schedule_apply([unit], show);      
-      if (start) unit.start = start;
-      if (due) unit.due = due;
-      self.dirty = true;
-      self.render();
-    });
-
-    // Remove unit handler
-    $('table.poc-schedule a.remove-unit').on('click', function(event) {
-      var row = $(this).closest('tr'),
-          path = row.data('location').split(' '),
-          unit = find_unit(self.schedule, path[0], path[1], path[2]);
-      schedule_apply([unit], hide);
-      self.dirty = true;
-      self.render(); 
-    });
-
-    // Show or hide save button
-    if (this.dirty) $('#dirty-schedule').show()
-    else $('#dirty-schedule').hide();
-
-    // Handle save button
-    $('#dirty-schedule #save-changes').on('click', function(event) {
-        event.preventDefault();
-        self.save();
-    });
-
-    $('#ajax-error').hide();
-  }
-
-  /**
-   * Handle date entry.
-   */
-  function enterNewDate(what) {
-    return function(event) {
-      var row = $(this).closest('tr');
-      var modal = $('#enter-date-modal')
-        .data('what', what)
-        .data('location', row.data('location'));
-      modal.find('h2').text(
-          what == 'due' ? '${_("Enter Due Date")}' : 
-              '${_("Enter Start Date")}');
-      modal.find('label').text(row.find('td:first').text());
-
-      var path = row.data('location').split(' '),
-          unit = find_unit(self.schedule, path[0], path[1], path[2]),
-          parts = unit[what] ? unit[what].split(' ') : ['', ''],
-          date = parts[0],
-          time = parts[1];
-
-      modal.find('input[name=date]').val(date);
-      modal.find('input[name=time]').val(time);
-
-      modal.find('form').off('submit').on('submit', function(event) {
-        event.preventDefault();
-        var date = $(this).find('input[name=date]').val(),
-            time = $(this).find('input[name=time]').val();
-        var valid_date = new Date(date);
-        if (isNaN(valid_date.valueOf())) {
-          alert('Please enter a valid date');
-          return;
-        }
-        var valid_time = /^\d{1,2}:\d{2}?$/;
-        if (!time.match(valid_time)) {
-          alert('Please enter a valid time');
-          return;
-        }
-        unit[what] = date + ' ' + time;
-        modal.find('.close-modal').click();
-        self.dirty = true;
-        self.render();
-      });
-    }
-  }
-
-  /**
-   * Returns a sequence of <option> DOM elements for a particular sequence
-   * of schedule nodes.
-   */
-  function schedule_options(nodes) {
-    return nodes.map(function(node) {
-      return $('<option>')
-        .attr('value', node.location)
-        .text(node.display_name)[0];
-    });
-  }
-
-  /**
-   * Return a schedule pruned by the given filter function.
-   */
-  function pruned(tree, filter) {
-    return tree.filter(filter)
-      .map(function(node) {
-        var copy = {};
-        $.extend(copy, node);
-        if (node.children) copy.children = pruned(node.children, filter);
-        return copy;
-      })
-      .filter(function(node) {
-        return node.children === undefined || node.children.length;
-      });
-  }
-
-  /**
-   * Get table rows that represent the children of given row in the schedule
-   * tree.
-   */
-  function get_children(row) {
-    var depth = $(row).data('depth');
-    return $(row).nextUntil(
-      $(row).siblings().filter(function() {
-        return $(this).data('depth') <= depth;
-      })
-    );
-  }
-
-  /**
-   * Handle click event for expanding/collapsing nodes in the schedule tree.
-   */
-  function toggle_collapse(event) {
-    event.preventDefault();
-    var row = $(this).closest('tr');
-    var children = get_children(row);
-
-    if (row.is('.expanded')) {
-      $(this).removeClass('icon-caret-down').addClass('icon-caret-right');
-      row.removeClass('expanded').addClass('collapsed');
-      children.hide(); 
-    }
-
-    else {
-      $(this).removeClass('icon-caret-right').addClass('icon-caret-down');
-      row.removeClass('collapsed').addClass('expanded');
-      children.filter('.collapsed').each(function() {
-        children = children.not(get_children(this));
-      });
-      children.show(); 
-    }
-  }
-
-  /**
-   * Save changes.
-   */
-  self.save = function() {
-    var button = $('#dirty-schedule #save-changes');
-    button.prop('disabled', true).text('${_("Saving")}...');
-    
-    $.ajax({
-        url: save_url,
-        type: 'POST',
-        contentType: 'application/json',
-        data: JSON.stringify(this.schedule),
-        success: function(data, textStatus, jqXHR) {
-          self.schedule = data.schedule;
-          self.dirty = false;
-          self.render();
-          button.prop('disabled', false).text('${_("Save changes")}');
-          
-          // Update textarea with grading policy JSON, since grading policy
-          // may have changed.  
-          $('#grading-policy').text(data.grading_policy);
-        },
-        error: function(jqXHR, textStatus, error) {
-          console.log(jqXHR.responseText);
-          $('#ajax-error').show();
-          $('#dirty-schedule').hide();
-          $('form#add-unit select,input,button').prop('disabled', true);
-        }
-      });
-  }
-
-  /**
-   * Add all nodes.
-   */
-  $('#add-all').on('click', function(event) {
-      event.preventDefault();
-      schedule_apply(self.schedule, show);
-      self.dirty = true;
-      self.render();
-  });
-
-  /**
-   * Visit every tree node, applying function.
-   */
-  function schedule_apply(nodes, f) {
-    nodes.map(function(node) {
-      f(node);
-      if (node.children !== undefined) schedule_apply(node.children, f);
-    });
-  }
-
-  /**
-   * Find a unit in the tree.
-   */
-  function find_unit(tree, chapter, sequential, vertical) {
-    var units = find_lineage(tree, chapter, sequential, vertical);
-    return units[units.length -1];
-  }
-
-  function find_lineage(tree, chapter, sequential, vertical) {
-    function find_in(seq, location) {
-      for (var i = 0; i < seq.length; i++)
-        if (seq[i].location === location)
-          return seq[i];
-    }
-
-    var units = [],
-        unit = find_in(tree, chapter);
-    units[units.length] = unit;
-    if (sequential) {
-      units[units.length] = unit = find_in(unit.children, sequential);
-      if (vertical) 
-        units[units.length] = unit = find_in(unit.children, vertical);
-    }
-
-    return units;
-  }
-
-  return self;
-})();
-
-$(function() { poc_schedule.render(); });
 </script>
diff --git a/lms/templates/pocs/schedule.underscore b/lms/templates/pocs/schedule.underscore
new file mode 100644
index 0000000000..ad3523b590
--- /dev/null
+++ b/lms/templates/pocs/schedule.underscore
@@ -0,0 +1,52 @@
+  <table class="poc-schedule">
+    <thead>
+      <tr>
+        <th><%- gettext('Unit') %></th>
+        <th><%- gettext('Start Date') %></th>
+        <th><%- gettext('Due Date') %></th>
+        <th><a href="#" id="remove-all">
+          <i class="icon-remove-sign icon"></i> <%- gettext('remove all') %>
+        </a></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% _.each(chapters, function(chapter) { %>
+        <tr class="chapter collapsed" data-location="<%= chapter.location %>" data-depth="1">
+          <td class="unit">
+            <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a> 
+            <%= chapter.display_name %>
+          </td>
+          <td class="date start-date"><a><%= chapter.start %></a></td>
+          <td class="date due-date"><a><%= chapter.due %></a></td>
+          <td><a href="#" class="remove-unit">
+            <i class="icon-remove-sign icon"></i> <%- gettext('remove') %>
+          </a></td>
+        </tr>
+        <% _.each(chapter.children, function(child) { %>
+          <tr class="sequential collapsed" data-depth="2" 
+              data-location="<%= chapter.location %> <%= child.location %>">
+            <td class="unit">
+              <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a> 
+              <%= child.display_name %>
+            </td>
+            <td class="date start-date"><a><%= child.start %></a></td>
+            <td class="date due-date"><a><%= child.due %></a></td>
+            <td><a href="#" class="remove-unit">
+              <i class="icon-remove-sign icon"></i> <%- gettext('remove') %>
+            </a></td>
+          </tr>
+          <% _.each(child.children, function(subchild) { %>
+            <tr class="vertical" data-dapth="3"
+                data-location="<%= chapter.location %> <%= child.location %> <%= subchild.location %>">
+              <td class="unit">&nbsp;<%= subchild.display_name %></td>
+              <td class="date start-date"><a><%= subchild.start %></a></td>
+              <td class="date due-date"><a><%= subchild.due %></a></td>
+              <td><a href="#" class="remove-unit">
+                <i class="icon-remove-sign icon"></i> <%- gettext('remove') %>
+              </a></td>
+          <% }); %>
+        <% }); %>
+      <% }); %>
+    </tbody>
+  </table>
+
diff --git a/lms/urls.py b/lms/urls.py
index cbeea15512..da4adcc9a1 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -351,6 +351,8 @@ if settings.COURSEWARE_ENABLED:
             'pocs.views.save_poc', name='save_poc'),
         url(r'^courses/{}/poc_invite$'.format(settings.COURSE_ID_PATTERN),
             'pocs.views.poc_invite', name='poc_invite'),
+        url(r'^courses/{}/poc_schedule$'.format(settings.COURSE_ID_PATTERN),
+            'pocs.views.poc_schedule', name='poc_schedule'),
         url(r'^courses/{}/poc_manage_student$'.format(settings.COURSE_ID_PATTERN),
             'pocs.views.poc_student_management', name='poc_manage_student'),
         url(r'^courses/{}/poc_gradebook$'.format(settings.COURSE_ID_PATTERN),

From 0b184881f58397cd115614a92d89f69bdd7694c2 Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Tue, 6 Jan 2015 12:26:26 -0800
Subject: [PATCH 20/29] MIT: CCX. Implement display of CCXs in user-facing
 templates such as dashboard

Show the display name for the POC in the menu for switching.

Remove the MOOC: prefix from the MOOC title to avoid truncation issues.

Incorporate the display name of the POC into the display of course org/number/name at the top of the page in the default theme.

Provide warning on the grading policy page in system warning style.

Provide a PocMembership model api that returns PocMemberships for a user.  Default to active memberships.

Build generator that yields triplets of poc, membership and course for each poc membership a user has.

This is an analog of the `get_course_enrollment_pairs` in common/djangoapps/students/views.py and is used in the student dashboard to provide pocs as options for a student to view.

refactor to use model api instead of inline code.

provide pocs as possible targets for a student to visit from their dashboard.

Unset the current active poc when visiting the dashboard so as to avoid needing to switch active pocs when viewing a plain course.  This ensures we can leave template code for the display of courses unchanged.

Update templates to show pocs in a course-like view on a student's dashboard.

Revert a portion of the template change so that the poc title will still render properly when a poc is being viewed.
---
 common/djangoapps/student/views.py            | 12 ++++
 lms/djangoapps/pocs/models.py                 |  4 ++
 lms/djangoapps/pocs/utils.py                  | 47 +++++++++++----
 lms/templates/dashboard.html                  | 57 +++++++++++++++++++
 lms/templates/navigation.html                 | 22 +++----
 .../pocs/_dashboard_poc_listing.html          | 29 ++++++++++
 lms/templates/pocs/grading_policy.html        | 13 +++++
 7 files changed, 161 insertions(+), 23 deletions(-)
 create mode 100644 lms/templates/pocs/_dashboard_poc_listing.html

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 8ec485a03a..69cfbd0ec3 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -660,6 +660,17 @@ def dashboard(request):
                                              if course.pre_requisite_courses)
     courses_requirements_not_met = get_pre_requisite_courses_not_completed(user, courses_having_prerequisites)
 
+    poc_membership_triplets = []
+    if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
+        from pocs import ACTIVE_POC_KEY
+        from pocs.utils import get_poc_membership_triplets
+        poc_membership_triplets = get_poc_membership_triplets(
+            user, course_org_filter, org_filter_out_set
+        )
+        # should we deselect any active POC at this time so that we don't have
+        # to change the URL for viewing a course?  I think so.
+        request.session[ACTIVE_POC_KEY] = None
+
     context = {
         'enrollment_message': enrollment_message,
         'course_enrollment_pairs': course_enrollment_pairs,
@@ -691,6 +702,7 @@ def dashboard(request):
         'provider_states': [],
         'order_history_list': order_history_list,
         'courses_requirements_not_met': courses_requirements_not_met,
+        'poc_membership_triplets': poc_membership_triplets,
     }
 
     if third_party_auth.is_enabled():
diff --git a/lms/djangoapps/pocs/models.py b/lms/djangoapps/pocs/models.py
index 1129d2f1cd..a6ec42e006 100644
--- a/lms/djangoapps/pocs/models.py
+++ b/lms/djangoapps/pocs/models.py
@@ -43,6 +43,10 @@ class PocMembership(models.Model):
         membership.save()
         future_membership.delete()
 
+    @classmethod
+    def memberships_for_user(cls, user, active=True):
+        return cls.objects.filter(student=user, active__exact=active)
+
 
 class PocFutureMembership(models.Model):
     """
diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/pocs/utils.py
index 9131c85342..1c79c9e5e8 100644
--- a/lms/djangoapps/pocs/utils.py
+++ b/lms/djangoapps/pocs/utils.py
@@ -4,19 +4,18 @@ POC Enrollment operations for use by Coach APIs.
 Does not include any access control, be sure to check access before calling.
 """
 
+from courseware.courses import get_course_about_section
+from courseware.courses import get_course_by_id
 from django.contrib.auth.models import User
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.mail import send_mail
-
-from courseware.courses import get_course_about_section
-from courseware.courses import get_course_by_id
 from edxmako.shortcuts import render_to_string
-
 from microsite_configuration import microsite
+from xmodule.modulestore.django import modulestore
+from xmodule.error_module import ErrorDescriptor
 
 from .models import (
-    PersonalOnlineCourse,
     PocMembership,
     PocFutureMembership,
 )
@@ -241,15 +240,12 @@ def get_all_pocs_for_user(user):
     current_active_poc = get_current_poc(user)
     if user.is_anonymous():
         return []
-    active_poc_memberships = PocMembership.objects.filter(
-        student=user, active__exact=True
-    )
     memberships = []
-    for membership in active_poc_memberships:
+    for membership in PocMembership.memberships_for_user(user):
         course = get_course_by_id(membership.poc.course_id)
-        course_title = get_course_about_section(course, 'title')
-        poc_title = 'POC: {}'.format(course_title)
-        mooc_title = 'MOOC: {}'.format(course_title)
+        poc = membership.poc
+        poc_title = poc.display_name
+        mooc_title = get_course_about_section(course, 'title')
         url = reverse(
             'switch_active_poc',
             args=[course.id.to_deprecated_string(), membership.poc.id]
@@ -266,3 +262,30 @@ def get_all_pocs_for_user(user):
             'mooc_url': mooc_url,
         })
     return memberships
+
+def get_poc_membership_triplets(user, course_org_filter, org_filter_out_set):
+    """
+    Get the relevant set of (PersonalOnlineCourse, PocMembership, Course)
+    triplets to be displayed on a student's dashboard.
+    """
+    # only active memberships for now
+    for membership in PocMembership.memberships_for_user(user):
+        poc = membership.poc
+        store = modulestore()
+        with store.bulk_operations(poc.course_id):
+            course = store.get_course(poc.course_id)
+            if course and not isinstance(course, ErrorDescriptor):
+                # if we are in a Microsite, then filter out anything that is not
+                # attributed (by ORG) to that Microsite
+                if course_org_filter and course_org_filter != course.location.org:
+                    continue
+                # Conversely, if we are not in a Microsite, then let's filter out any enrollments
+                # with courses attributed (by ORG) to Microsites
+                elif course.location.org in org_filter_out_set:
+                    continue
+
+                yield (poc, membership, course)
+            else:
+                log.error("User {0} enrolled in {2} course {1}".format(
+                    user.username, poc.course_id, "broken" if course else "non-existent"
+                ))
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 818baf536b..c828bf3085 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -222,6 +222,63 @@
       </ul>
     </section>
   </section>
+
+  <section id="my-courses" class="my-courses" role="main" aria-label="Content">
+    <header>
+      <h2>${_("Current Courses")}</h2>
+    </header>
+
+    % if len(course_enrollment_pairs) > 0:
+      <ul class="listing-courses">
+        % for course, enrollment in course_enrollment_pairs:
+            <% show_courseware_link = (course.id in show_courseware_links_for) %>
+            <% cert_status = cert_statuses.get(course.id) %>
+            <% show_email_settings = (course.id in show_email_settings_for) %>
+            <% course_mode_info = all_course_modes.get(course.id) %>
+            <% show_refund_option = (course.id in show_refund_option_for) %>
+            <% is_paid_course = (course.id in enrolled_courses_either_paid) %>
+            <% is_course_blocked = (course.id in block_courses) %>
+            <% course_verification_status = verification_status_by_course.get(course.id, {}) %>
+            <% course_requirements = courses_requirements_not_met.get(course.id) %>
+            <%include file='dashboard/_dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, show_refund_option = show_refund_option, is_paid_course = is_paid_course, is_course_blocked = is_course_blocked, verification_status=course_verification_status, course_requirements=course_requirements" />
+      % endfor
+
+      % if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
+        % for poc, membership, course in poc_membership_triplets:
+            <%include file='pocs/_dashboard_poc_listing.html' args="poc=poc, membership=membership, course=course" />
+        % endfor
+      % endif
+
+      </ul>
+    % else:
+      <section class="empty-dashboard-message">
+        % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
+          <p>${_("Looks like you haven't enrolled in any courses yet.")}</p>
+          <a href="${marketing_link('COURSES')}">
+            ${_("Find courses now!")}
+          </a>
+        % else:
+          <p>${_("Looks like you haven't enrolled in any courses yet.")}</p>
+        %endif
+      </section>
+    % endif
+
+    % if staff_access and len(errored_courses) > 0:
+      <div id="course-errors">
+        <h2>${_("Course-loading errors")}</h2>
+
+      % for course_dir, errors in errored_courses.items():
+         <h3>${course_dir | h}</h3>
+             <ul>
+           % for (msg, err) in errors:
+               <li>${msg}
+                 <ul><li><pre>${err}</pre></li></ul>
+               </li>
+           % endfor
+             </ul>
+      % endfor
+    % endif
+  </section>
 </section>
 
 <section id="email-settings-modal" class="modal" aria-hidden="true">
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index e66be26f63..18cab9a321 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -13,7 +13,7 @@ from status.status import get_site_status_msg
 
 <%! from microsite_configuration import microsite %>
 <%! from microsite_configuration.templatetags.microsite import platform_name %>
-<%! from pocs.utils import get_all_pocs_for_user %>
+<%! from pocs.overrides import get_current_poc %>
 
 ## Provide a hook for themes to inject branding on top.
 <%block name="navigation_top" />
@@ -48,7 +48,16 @@ site_status_msg = get_site_status_msg(course_id)
     </h1>
 
     % if course:
-    <h2><span class="provider">${course.display_org_with_default | h}:</span> ${course.display_number_with_default | h} ${course.display_name_with_default}</h2>
+    <h2><span class="provider">${course.display_org_with_default | h}:</span> 
+      ${course.display_number_with_default | h}
+      <%
+        display_name = course.display_name_with_default
+        if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
+          poc = get_current_poc(user)
+          if poc:
+            display_name = poc.display_name
+      %>
+      ${display_name}</h2>
     % endif
 
     % if user.is_authenticated():
@@ -83,15 +92,6 @@ site_status_msg = get_site_status_msg(course_id)
             % if settings.MKTG_URL_LINK_MAP.get('FAQ'):
               <li><a href="${marketing_link('FAQ')}">${_("Help")}</a></li>
             % endif
-            % if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
-              %for poc in get_all_pocs_for_user(user):
-                % if poc['active']:
-                <li><a href="${poc['mooc_url']}" role="menuitem">${poc['mooc_name']}</a></li>
-                % else:
-                <li><a href="${poc['poc_url']}" role="menuitem">${poc['poc_name']}</a></li>
-                % endif
-              %endfor
-            % endif
           </%block>
           <li><a href="${reverse('logout')}" role="menuitem">${_("Sign out")}</a></li>
         </ul>
diff --git a/lms/templates/pocs/_dashboard_poc_listing.html b/lms/templates/pocs/_dashboard_poc_listing.html
new file mode 100644
index 0000000000..8d032d1274
--- /dev/null
+++ b/lms/templates/pocs/_dashboard_poc_listing.html
@@ -0,0 +1,29 @@
+<%page args="poc, membership, course" />
+
+<%! from django.utils.translation import ugettext as _ %>
+<%!
+  from django.core.urlresolvers import reverse
+  from courseware.courses import course_image_url, get_course_about_section
+%>
+<%
+  poc_switch_target = reverse('switch_active_poc', args=[course.id.to_deprecated_string(), poc.id])
+%>
+<li class="course-item">
+  <article class="course">
+    <a href="${poc_switch_target}" class="cover">
+      <img src="${course_image_url(course)}" alt="${_('{course_number} {poc_name} Cover Image').format(course_number=course.number, poc_name=poc.display_name) |h}" />
+    </a>
+    <section class="info">
+      <hgroup>
+        <p class="date-block">
+        Personal Online Course
+        </p>
+        <h2 class="university">${get_course_about_section(course, 'university')}</h2>
+        <h3>
+          <a href="${poc_switch_target}">${course.display_number_with_default | h} ${poc.display_name}</a>
+        </h3>
+      </hgroup>
+      <a href="${poc_switch_target}" class="enter-course">${_('View Course')}</a>
+    </section>
+  </article>
+</li>
diff --git a/lms/templates/pocs/grading_policy.html b/lms/templates/pocs/grading_policy.html
index d641ee018d..6f1ec6af41 100644
--- a/lms/templates/pocs/grading_policy.html
+++ b/lms/templates/pocs/grading_policy.html
@@ -1,5 +1,18 @@
 <%! from django.utils.translation import ugettext as _ %>
 
+<div id="warn-coach" class="wrapper-msg urgency-high warning">
+  <div class="msg">
+    <i class="msg-icon icon-warning-sign"></i>
+    <div class="msg-content">
+      <h3 class="title">${_("WARNING")}</h3>
+      <div class="copy">
+        <p>${_("For advanced users only. Errors in the grading policy can lead to the course failing to display. This form does not check the validity of the policy before saving.")}</p>
+        <p>${_("Most coaches should not need to make changes to the grading policy.")}</p>
+      </div>
+    </div>
+  </div>
+</div>
+
 <h2>${_("Grading Policy")}</h2>
 
 <form action="${grading_policy_url}" method="POST">

From 97748e56ea103320dba54e5dca9c313e654ac149 Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Wed, 14 Jan 2015 21:35:15 -0600
Subject: [PATCH 21/29] MIT: CCX. Fix test failures

Django double-importing overwrites the TESTUSER object, invalidating identity comparisons.  Use a string instead to avoid the problem.

The get_current_poc function operates using a threadlocal and so no longer requires the user as an argument
---
 .../courseware/tests/test_field_overrides.py  |   2 +-
 lms/djangoapps/pocs/overrides.py              |   4 +-
 lms/djangoapps/pocs/utils.py                  |   2 +-
 lms/static/js/pocs/schedule.js                | 167 ++++--------------
 lms/templates/navigation.html                 |   2 +-
 5 files changed, 41 insertions(+), 136 deletions(-)

diff --git a/lms/djangoapps/courseware/tests/test_field_overrides.py b/lms/djangoapps/courseware/tests/test_field_overrides.py
index 77ea374f4c..4d0af91970 100644
--- a/lms/djangoapps/courseware/tests/test_field_overrides.py
+++ b/lms/djangoapps/courseware/tests/test_field_overrides.py
@@ -15,7 +15,7 @@ from ..field_overrides import (
 )
 
 
-TESTUSER = object()
+TESTUSER = "testuser"
 
 
 @override_settings(FIELD_OVERRIDE_PROVIDERS=(
diff --git a/lms/djangoapps/pocs/overrides.py b/lms/djangoapps/pocs/overrides.py
index f93713dc7f..c7fa1ab2bf 100644
--- a/lms/djangoapps/pocs/overrides.py
+++ b/lms/djangoapps/pocs/overrides.py
@@ -20,7 +20,7 @@ class PersonalOnlineCoursesOverrideProvider(FieldOverrideProvider):
     overrides to be made on a per user basis.
     """
     def get(self, block, name, default):
-        poc = get_current_poc(self.user)
+        poc = get_current_poc()
         if poc:
             return get_override_for_poc(poc, block, name, default)
         return default
@@ -51,7 +51,7 @@ def poc_context(poc):
     _POC_CONTEXT.poc = prev
 
 
-def get_current_poc(user):
+def get_current_poc():
     """
     Return the poc that is active for this request.
     """
diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/pocs/utils.py
index 1c79c9e5e8..0678d4021c 100644
--- a/lms/djangoapps/pocs/utils.py
+++ b/lms/djangoapps/pocs/utils.py
@@ -237,9 +237,9 @@ def get_all_pocs_for_user(user):
         mooc_url: <url to view this MOOC>
     }
     """
-    current_active_poc = get_current_poc(user)
     if user.is_anonymous():
         return []
+    current_active_poc = get_current_poc()
     memberships = []
     for membership in PocMembership.memberships_for_user(user):
         course = get_course_by_id(membership.poc.course_id)
diff --git a/lms/static/js/pocs/schedule.js b/lms/static/js/pocs/schedule.js
index 9e168dd867..ee234053aa 100644
--- a/lms/static/js/pocs/schedule.js
+++ b/lms/static/js/pocs/schedule.js
@@ -49,17 +49,18 @@ var edx = edx || {};
 	    self = this;
 	    $('#add-all').on('click', function(event) {
 	        event.preventDefault();
-	        this.schedule_apply(self.schedule, show);
+	        self.schedule_apply(self.schedule, self.show);
 	        self.dirty = true;
+		self.schedule_collection.set(self.schedule);
 	        self.render();
 	    });
         },
 
         render: function() {
-	    this.schedule = this.schedule_collection.toJSON();
-            this.hidden = this.pruned(this.schedule, function(node) {
+	    self.schedule = this.schedule_collection.toJSON();
+            self.hidden = this.pruned(self.schedule, function(node) {
               return node.hidden || node.category !== 'vertical'});
-            this.showing = this.pruned(this.schedule, function(node) {
+            this.showing = this.pruned(self.schedule, function(node) {
               return !node.hidden});
             this.$el.html(schedule_template({chapters: this.showing}));
             $('table.poc-schedule .sequential,.vertical').hide();
@@ -80,8 +81,9 @@ var edx = edx || {};
 	    // Click handler for remove all
 	    $('table.poc-schedule a#remove-all').on('click', function(event) {
 	      event.preventDefault();
-	      this.schedule_apply(self.schedule, hide);
+	      self.schedule_apply(self.schedule, self.hide);
 	      self.dirty = true;
+	      self.schedule_collection.set(self.schedule);
 	      self.render();
 	    });
 
@@ -90,7 +92,7 @@ var edx = edx || {};
 	      // Populate chapters select, depopulate others
 	      this.chapter_select.html('')
 		.append('<option value="none">'+gettext("Select a chapter")+'...</option>')
-		.append(this.schedule_options(this.hidden));
+		.append(self.schedule_options(this.hidden));
 	      this.sequential_select.html('').prop('disabled', true);
 	      this.vertical_select.html('').prop('disabled', true);
 	      $('form#add-unit').show();
@@ -124,11 +126,11 @@ var edx = edx || {};
 	    this.sequential_select.on('change', function(event) {
 	      var sequential_location = self.sequential_select.val();
 	      if (sequential_location !== 'all') {
-		var chapter = self.chapter_select.val();
+		var chapter = self.chapter_select.val(),
 		sequential = self.find_unit(self.hidden, chapter, sequential_location);
 		self.vertical_select.html('')
 		  .append('<option value="all">'+gettext("All units")+'</option>')
-		  .append(schedule_options(sequential.children));
+		  .append(self.schedule_options(sequential.children));
 		self.vertical_select.prop('disabled', false);
 		self.set_datetime('start', sequential.start);
 		self.set_datetime('due', sequential.due);
@@ -141,9 +143,9 @@ var edx = edx || {};
 	    this.vertical_select.on('change', function(event) {
 	      var vertical_location = self.vertical_select.val();
 	      if (vertical_location !== 'all') {
-		var chapter = chapter_select.val(),
+		var chapter = self.chapter_select.val(),
 		    sequential = self.sequential_select.val();
-		vertical = self.find_unit(
+		var vertical = self.find_unit(
 		  self.hidden, chapter, sequential, vertical_location);
 		self.set_datetime('start', vertical.start);
 		self.set_datetime('due', vertical.due);
@@ -162,11 +164,12 @@ var edx = edx || {};
 		    vertical == 'all' ? null: vertical),
 		  start = self.get_datetime('start'),
 		  due = self.get_datetime('due');
-	      units.map(show);
-	      unit = units[units.length - 1]
-	      self.schedule_apply([unit], show);      
-	      if (start) unit.start = start;
-	      if (due) unit.due = due;
+	      units.map(self.show);
+	      var unit = units[units.length - 1]
+	      self.schedule_apply([unit], self.show);      
+	      if (unit !== undefined && start) unit.start = start;
+	      if (unit !== undefined && due) unit.due = due;
+	      self.schedule_collection.set(self.schedule);
 	      self.dirty = true;
 	      self.render();
 	    });
@@ -177,6 +180,7 @@ var edx = edx || {};
 		  path = row.data('location').split(' '),
 		  unit = self.find_unit(self.schedule, path[0], path[1], path[2]);
 	      self.schedule_apply([unit], self.hide);
+	      self.schedule_collection.set(self.schedule);
 	      self.dirty = true;
 	      self.render(); 
 	    });
@@ -197,6 +201,7 @@ var edx = edx || {};
 	},
 
 	save: function() {
+	    self.schedule_collection.set(self.schedule);
 	    var button = $('#dirty-schedule #save-changes');
 	    button.prop('disabled', true).text(gettext("Saving")+'...');
 	    
@@ -204,9 +209,8 @@ var edx = edx || {};
 		url: save_url,
 		type: 'POST',
 		contentType: 'application/json',
-		data: JSON.stringify(this.schedule),
+		data: JSON.stringify(self.schedule),
 		success: function(data, textStatus, jqXHR) {
-		  self.schedule = data.schedule;
 		  self.dirty = false;
 		  self.render();
 		  button.prop('disabled', false).text(gettext("Save changes"));
@@ -220,16 +224,21 @@ var edx = edx || {};
 		  $('#ajax-error').show();
 		  $('#dirty-schedule').hide();
 		  $('form#add-unit select,input,button').prop('disabled', true);
+		  button.prop('disabled', false).text(gettext("Save changes"));
 		}
 	      });
 	},
 
 	hide: function(unit) {
-	    unit.hidden = true;
+	    if (unit !== undefined) {
+	        unit.hidden = true;
+	    }
 	},
 
         show: function(unit) {
-	    unit.hidden = false;
+	    if (unit !== undefined) {
+	        unit.hidden = false;
+	    }
 	},
 
 	get_datetime: function(which) {
@@ -259,7 +268,7 @@ var edx = edx || {};
 	schedule_apply: function(nodes, f) {
 	    nodes.map(function(node) {
 	      f(node);
-	      if (node.children !== undefined) self.schedule_apply(node.children, f);
+	      if (node !== undefined && node.children !== undefined) self.schedule_apply(node.children, f);
 	    });
 	},
 
@@ -331,9 +340,14 @@ var edx = edx || {};
 		  alert('Please enter a valid time');
 		  return;
 		}
-		unit[what] = date + ' ' + time;
+		if (what == 'start') {
+		    unit.start = date + ' ' + time;
+		} else {
+		    unit.due = date + ' ' + time;
+		}
 		modal.find('.close-modal').click();
 		self.dirty = true;
+		self.schedule_collection.set(self.schedule);
 		self.render();
 	      });
 	    }
@@ -374,116 +388,7 @@ var edx = edx || {};
 
     });
 
-	    edx.pocs.schedule.XScheduleView = Backbone.View.extend({
-
-		events: {
-		    'submit': 'submit',
-		    'change': 'change'
-		},
-
-		initialize: function() {
-		    _.bindAll(this, 'render', 'change', 'submit', 'invalidProfile', 'invalidPreference', 'error', 'sync', 'clearStatus');
-		    
-		    this.scheduleModel = new edx.pocs.schedule.ProfileModel();
-		    this.scheduleModel.on('invalid', this.invalidProfile);
-		    this.scheduleModel.on('error', this.error);
-		    this.scheduleModel.on('sync', this.sync);
-
-		    this.preferencesModel = new edx.pocs.schedule.PreferencesModel();
-		    this.preferencesModel.on('invalid', this.invalidPreference);
-		    this.preferencesModel.on('error', this.error);
-		    this.preferencesModel.on('sync', this.sync);
-		},
-
-		render: function() {
-		    this.$el.html(_.template($('#schedule-tpl').html()));
-
-		    this.$nameField = $('#schedule-name', this.$el);
-		    this.$nameStatus = $('#schedule-name-status', this.$el);
-		    
-		    this.$languageChoices = $('#preference-language', this.$el);
-		    this.$languageStatus = $('#preference-language-status', this.$el);
-
-		    this.$submitStatus = $('#submit-status', this.$el);
-
-		    var self = this;
-		    $.getJSON('preferences/languages')
-			.done(function(json) {
-			    /** Asynchronously populate the language choices. */
-			    self.$languageChoices.html(_.template($('#languages-tpl').html(), {languageInfo: json}));
-			})
-			.fail(function() {
-			    self.$languageStatus
-				.addClass('language-list-error')
-				.text(gettext("We couldn't populate the list of language choices."));
-			});
-
-		    return this;
-		},
-
-		change: function() {
-		    this.scheduleModel.set({
-			fullName: this.$nameField.val()
-		    });
-
-		    this.preferencesModel.set({
-			language: this.$languageChoices.val()
-		    });
-		},
-
-		submit: function(event) {
-		    event.preventDefault();
-		    this.clearStatus();
-		    this.scheduleModel.save();
-		    this.preferencesModel.save();
-		},
-
-		invalidProfile: function(model) {
-		    var errors = model.validationError;
-		    if (errors.hasOwnProperty('fullName')) {
-			this.$nameStatus
-			    .addClass('validation-error')
-			    .text(errors.fullName);
-		    }
-		},
-
-		invalidPreference: function(model) {
-		    var errors = model.validationError;
-		    if (errors.hasOwnProperty('language')) {
-			this.$languageStatus
-			    .addClass('validation-error')
-			    .text(errors.language);
-		    }
-		},
-
-		error: function(error) {
-		    this.$submitStatus
-			.addClass('error')
-			.text(error);
-		},
-
-		sync: function() {
-		    this.$submitStatus
-			.addClass('success')
-			.text(gettext("Saved"));
-		},
-
-		clearStatus: function() {
-		    this.$nameStatus
-			.removeClass('validation-error')
-			.text("");
-
-		    this.$languageStatus
-			.removeClass('validation-error')
-			.text("");
-
-		    this.$submitStatus
-			.removeClass('error')
-			.text("");
-		}
-	    });
-
-	})(jQuery, _, Backbone, gettext);
+})(jQuery, _, Backbone, gettext);
 
 
 
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index 18cab9a321..f011effa7f 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -53,7 +53,7 @@ site_status_msg = get_site_status_msg(course_id)
       <%
         display_name = course.display_name_with_default
         if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
-          poc = get_current_poc(user)
+          poc = get_current_poc()
           if poc:
             display_name = poc.display_name
       %>

From fbaab9674f8458ec02890390a769ce5d2aa9e822 Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Fri, 16 Jan 2015 14:26:47 -0800
Subject: [PATCH 22/29] MIT CCX: Prevent the discussion tab from displaying

When the POC feature is enabled and there is an active poc displaying discussions leads to undefined behaviors.  Hide the tab to prevent usability problems.
---
 common/lib/xmodule/xmodule/tabs.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/lib/xmodule/xmodule/tabs.py b/common/lib/xmodule/xmodule/tabs.py
index 66285df67d..0f4d2bdbc7 100644
--- a/common/lib/xmodule/xmodule/tabs.py
+++ b/common/lib/xmodule/xmodule/tabs.py
@@ -376,6 +376,10 @@ class DiscussionTab(EnrolledOrStaffTab):
         )
 
     def can_display(self, course, settings, is_user_authenticated, is_user_staff, is_user_enrolled):
+        if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
+            from pocs.overrides import get_current_poc
+            if get_current_poc():
+                return False
         super_can_display = super(DiscussionTab, self).can_display(
             course, settings, is_user_authenticated, is_user_staff, is_user_enrolled
         )

From 7f691e4a928a9e67f8117958b8c4f1e88978d8ef Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Fri, 16 Jan 2015 15:19:55 -0800
Subject: [PATCH 23/29] MIT: CCX.  Rename POC to CCX

Final official name is Custom Courses for EdX (CCX), rename all code to remove previous name.

Rename the FEATURE constant used to identify this feature

Rename the middleware for the CCX change

rename the constant used for storing the current poc id on the session.

rename the _PocContext threading local

rename the override provider in all places where it is referenced

`PersonalOnlineCoursesOverrideProvider` -> `CustomCoursesForEdxOverrideProvider`

generally rename symbols from overrides.py to replace `poc` with `ccx` where possible without changing model names or attributes

rename more symbols from poc to ccx
rename util functions from app utils module

general symbol renaming poc -> ccx in views.py and related url changes

Rename the coach role wherever it is used.

reword poc_coach to ccx_coach

UI rename

replace POC with CCX globally

template context variable renamed

rename poc_ to ccx_ in urls and all related locations (views, js, scss etc)

remove pocs migrations

Final massive renaming, including models.  Re-built migration.

cleaning up a few tailing references

Fix reference typo in schedule template JS

undo modifications made on the fly in test setup to ensure that our tests are properly isolated from the rest of the system tests.

Fixes jazkarta/edx-platform#38

Clean up some leftover strings and comments

fixing more strings and comments in python files

fix a naming error in the schedule tab that was causing problems in deleting courseware items.

Fixes jazkarta/edx-platform#36

updating tests and utility code to match changes in infrastructure from latest rebase
---
 common/djangoapps/student/roles.py            |   8 +-
 common/djangoapps/student/views.py            |  26 +-
 common/lib/xmodule/xmodule/tabs.py            |  32 +-
 lms/djangoapps/ccx/__init__.py                |   1 +
 .../{pocs => ccx}/migrations/0001_initial.py  | 107 ++++---
 .../{pocs => ccx}/migrations/__init__.py      |   0
 lms/djangoapps/{pocs => ccx}/models.py        |  28 +-
 lms/djangoapps/ccx/overrides.py               | 159 ++++++++++
 .../{pocs => ccx}/tests/__init__.py           |   0
 lms/djangoapps/ccx/tests/factories.py         |  18 ++
 .../{pocs => ccx}/tests/test_models.py        |  65 ++--
 .../{pocs => ccx}/tests/test_overrides.py     |  45 +--
 .../{pocs => ccx}/tests/test_utils.py         | 210 ++++++------
 .../{pocs => ccx}/tests/test_views.py         | 299 +++++++++---------
 lms/djangoapps/{pocs => ccx}/utils.py         | 147 ++++-----
 lms/djangoapps/{pocs => ccx}/views.py         | 214 ++++++-------
 lms/djangoapps/courseware/grades.py           |   2 +-
 lms/djangoapps/instructor/access.py           |   4 +-
 lms/djangoapps/instructor/views/api.py        |   6 +-
 lms/djangoapps/pocs/__init__.py               |   1 -
 ...bership__add_field_pocmembership_active.py | 100 ------
 ..._poc_membership_future_auto_enroll_flag.py |  90 ------
 lms/djangoapps/pocs/overrides.py              | 159 ----------
 lms/djangoapps/pocs/tests/factories.py        |  18 --
 lms/envs/aws.py                               |  10 +-
 lms/envs/common.py                            |  13 +-
 lms/envs/test.py                              |   6 +-
 lms/static/js/{pocs => ccx}/schedule.js       |  34 +-
 lms/static/sass/course.scss.mako              |   4 +-
 .../{poc_coach => ccx_coach}/_dashboard.scss  |  10 +-
 .../_dashboard_ccx_listing.html}              |  14 +-
 .../{pocs => ccx}/coach_dashboard.html        |  20 +-
 .../enroll_email_allowedmessage.txt           |   0
 .../enroll_email_allowedsubject.txt           |   0
 .../enroll_email_enrolledmessage.txt          |   0
 .../enroll_email_enrolledsubject.txt          |   0
 lms/templates/{pocs => ccx}/enrollment.html   |   6 +-
 .../{pocs => ccx}/grading_policy.html         |   0
 lms/templates/{pocs => ccx}/schedule.html     |  30 +-
 .../{pocs => ccx}/schedule.underscore         |   8 +-
 .../{pocs => ccx}/student_admin.html          |   0
 .../unenroll_email_allowedmessage.txt         |   0
 .../unenroll_email_enrolledmessage.txt        |   0
 .../{pocs => ccx}/unenroll_email_subject.txt  |   0
 lms/templates/dashboard.html                  |   6 +-
 .../instructor_dashboard_2/membership.html    |  10 +-
 lms/templates/navigation.html                 |  10 +-
 lms/urls.py                                   |  40 +--
 48 files changed, 913 insertions(+), 1047 deletions(-)
 create mode 100644 lms/djangoapps/ccx/__init__.py
 rename lms/djangoapps/{pocs => ccx}/migrations/0001_initial.py (62%)
 rename lms/djangoapps/{pocs => ccx}/migrations/__init__.py (100%)
 rename lms/djangoapps/{pocs => ccx}/models.py (68%)
 create mode 100644 lms/djangoapps/ccx/overrides.py
 rename lms/djangoapps/{pocs => ccx}/tests/__init__.py (100%)
 create mode 100644 lms/djangoapps/ccx/tests/factories.py
 rename lms/djangoapps/{pocs => ccx}/tests/test_models.py (59%)
 rename lms/djangoapps/{pocs => ccx}/tests/test_overrides.py (71%)
 rename lms/djangoapps/{pocs => ccx}/tests/test_utils.py (75%)
 rename lms/djangoapps/{pocs => ccx}/tests/test_views.py (75%)
 rename lms/djangoapps/{pocs => ccx}/utils.py (66%)
 rename lms/djangoapps/{pocs => ccx}/views.py (71%)
 delete mode 100644 lms/djangoapps/pocs/__init__.py
 delete mode 100644 lms/djangoapps/pocs/migrations/0002_auto__add_pocfuturemembership__add_field_pocmembership_active.py
 delete mode 100644 lms/djangoapps/pocs/migrations/0003_add_poc_membership_future_auto_enroll_flag.py
 delete mode 100644 lms/djangoapps/pocs/overrides.py
 delete mode 100644 lms/djangoapps/pocs/tests/factories.py
 rename lms/static/js/{pocs => ccx}/schedule.js (92%)
 rename lms/static/sass/course/{poc_coach => ccx_coach}/_dashboard.scss (87%)
 rename lms/templates/{pocs/_dashboard_poc_listing.html => ccx/_dashboard_ccx_listing.html} (54%)
 rename lms/templates/{pocs => ccx}/coach_dashboard.html (89%)
 rename lms/templates/{pocs => ccx}/enroll_email_allowedmessage.txt (100%)
 rename lms/templates/{pocs => ccx}/enroll_email_allowedsubject.txt (100%)
 rename lms/templates/{pocs => ccx}/enroll_email_enrolledmessage.txt (100%)
 rename lms/templates/{pocs => ccx}/enroll_email_enrolledsubject.txt (100%)
 rename lms/templates/{pocs => ccx}/enrollment.html (96%)
 rename lms/templates/{pocs => ccx}/grading_policy.html (100%)
 rename lms/templates/{pocs => ccx}/schedule.html (83%)
 rename lms/templates/{pocs => ccx}/schedule.underscore (94%)
 rename lms/templates/{pocs => ccx}/student_admin.html (100%)
 rename lms/templates/{pocs => ccx}/unenroll_email_allowedmessage.txt (100%)
 rename lms/templates/{pocs => ccx}/unenroll_email_enrolledmessage.txt (100%)
 rename lms/templates/{pocs => ccx}/unenroll_email_subject.txt (100%)

diff --git a/common/djangoapps/student/roles.py b/common/djangoapps/student/roles.py
index c94789641f..b2127bee41 100644
--- a/common/djangoapps/student/roles.py
+++ b/common/djangoapps/student/roles.py
@@ -267,12 +267,12 @@ class LibraryUserRole(CourseRole):
         super(LibraryUserRole, self).__init__(self.ROLE, *args, **kwargs)
 
 
-class CoursePocCoachRole(CourseRole):
-    """A POC Coach"""
-    ROLE = 'poc_coach'
+class CourseCcxCoachRole(CourseRole):
+    """A CCX Coach"""
+    ROLE = 'ccx_coach'
 
     def __init__(self, *args, **kwargs):
-        super(CoursePocCoachRole, self).__init__(self.ROLE, *args, **kwargs)
+        super(CourseCcxCoachRole, self).__init__(self.ROLE, *args, **kwargs)
 
 
 class OrgStaffRole(OrgRole):
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 69cfbd0ec3..d87f893708 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -660,16 +660,16 @@ def dashboard(request):
                                              if course.pre_requisite_courses)
     courses_requirements_not_met = get_pre_requisite_courses_not_completed(user, courses_having_prerequisites)
 
-    poc_membership_triplets = []
-    if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
-        from pocs import ACTIVE_POC_KEY
-        from pocs.utils import get_poc_membership_triplets
-        poc_membership_triplets = get_poc_membership_triplets(
+    ccx_membership_triplets = []
+    if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
+        from ccx import ACTIVE_CCX_KEY
+        from ccx.utils import get_ccx_membership_triplets
+        ccx_membership_triplets = get_ccx_membership_triplets(
             user, course_org_filter, org_filter_out_set
         )
-        # should we deselect any active POC at this time so that we don't have
+        # should we deselect any active CCX at this time so that we don't have
         # to change the URL for viewing a course?  I think so.
-        request.session[ACTIVE_POC_KEY] = None
+        request.session[ACTIVE_CCX_KEY] = None
 
     context = {
         'enrollment_message': enrollment_message,
@@ -702,7 +702,7 @@ def dashboard(request):
         'provider_states': [],
         'order_history_list': order_history_list,
         'courses_requirements_not_met': courses_requirements_not_met,
-        'poc_membership_triplets': poc_membership_triplets,
+        'ccx_membership_triplets': ccx_membership_triplets,
     }
 
     if third_party_auth.is_enabled():
@@ -1818,15 +1818,15 @@ def activate_account(request, key):
                 if cea.auto_enroll:
                     CourseEnrollment.enroll(student[0], cea.course_id)
 
-            # enroll student in any pending POCs he/she may have if auto_enroll flag is set
-            if settings.FEATURES.get('PERSONAL_ONLINE_COURSES'):
-                from pocs.models import PocMembership, PocFutureMembership
-                pfms = PocFutureMembership.objects.filter(
+            # enroll student in any pending CCXs he/she may have if auto_enroll flag is set
+            if settings.FEATURES.get('CUSTOM_COURSES_EDX'):
+                from ccx.models import CcxMembership, CcxFutureMembership
+                pfms = CcxFutureMembership.objects.filter(
                     email=student[0].email
                 )
                 for pfm in pfms:
                     if pfm.auto_enroll:
-                        PocMembership.auto_enroll(student[0], pfm)
+                        CcxMembership.auto_enroll(student[0], pfm)
 
         resp = render_to_response(
             "registration/activation_complete.html",
diff --git a/common/lib/xmodule/xmodule/tabs.py b/common/lib/xmodule/xmodule/tabs.py
index 0f4d2bdbc7..28c9a12393 100644
--- a/common/lib/xmodule/xmodule/tabs.py
+++ b/common/lib/xmodule/xmodule/tabs.py
@@ -193,7 +193,7 @@ class CourseTab(object):
             'edxnotes': EdxNotesTab,
             'syllabus': SyllabusTab,
             'instructor': InstructorTab,  # not persisted
-            'poc_coach': PocCoachTab,  # not persisted
+            'ccx_coach': CcxCoachTab,  # not persisted
         }
 
         tab_type = tab_dict.get('type')
@@ -376,9 +376,9 @@ class DiscussionTab(EnrolledOrStaffTab):
         )
 
     def can_display(self, course, settings, is_user_authenticated, is_user_staff, is_user_enrolled):
-        if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
-            from pocs.overrides import get_current_poc
-            if get_current_poc():
+        if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
+            from ccx.overrides import get_current_ccx
+            if get_current_ccx():
                 return False
         super_can_display = super(DiscussionTab, self).can_display(
             course, settings, is_user_authenticated, is_user_staff, is_user_enrolled
@@ -738,26 +738,26 @@ class InstructorTab(StaffTab):
         )
 
 
-class PocCoachTab(CourseTab):
+class CcxCoachTab(CourseTab):
     """
-    A tab for the personal online course coaches.
+    A tab for the custom course coaches.
     """
-    type = 'poc_coach'
+    type = 'ccx_coach'
 
     def __init__(self, tab_dict=None):  # pylint: disable=unused-argument
-        super(PocCoachTab, self).__init__(
-            name=_('POC Coach'),
+        super(CcxCoachTab, self).__init__(
+            name=_('CCX Coach'),
             tab_id=self.type,
-            link_func=link_reverse_func('poc_coach_dashboard'),
+            link_func=link_reverse_func('ccx_coach_dashboard'),
         )
 
     def can_display(self, course, settings, *args, **kw):
-        # TODO Check that user actually has 'poc_coach' role on course
+        # TODO Check that user actually has 'ccx_coach' role on course
         #      this is difficult to do because the user isn't passed in.
         #      We need either a hack or an architectural realignment.
         return (
-            settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False) and
-            super(PocCoachTab, self).can_display(course, settings, *args, **kw))
+            settings.FEATURES.get('CUSTOM_COURSES_EDX', False) and
+            super(CcxCoachTab, self).can_display(course, settings, *args, **kw))
 
 
 class CourseTabList(List):
@@ -860,9 +860,9 @@ class CourseTabList(List):
         instructor_tab = InstructorTab()
         if instructor_tab.can_display(course, settings, is_user_authenticated, is_user_staff, is_user_enrolled):
             yield instructor_tab
-        poc_coach_tab = PocCoachTab()
-        if poc_coach_tab.can_display(course, settings, is_user_authenticated, is_user_staff, is_user_enrolled):
-            yield poc_coach_tab
+        ccx_coach_tab = CcxCoachTab()
+        if ccx_coach_tab.can_display(course, settings, is_user_authenticated, is_user_staff, is_user_enrolled):
+            yield ccx_coach_tab
 
     @staticmethod
     def iterate_displayable_cms(
diff --git a/lms/djangoapps/ccx/__init__.py b/lms/djangoapps/ccx/__init__.py
new file mode 100644
index 0000000000..cf6e925092
--- /dev/null
+++ b/lms/djangoapps/ccx/__init__.py
@@ -0,0 +1 @@
+ACTIVE_CCX_KEY = '_ccx_id'
diff --git a/lms/djangoapps/pocs/migrations/0001_initial.py b/lms/djangoapps/ccx/migrations/0001_initial.py
similarity index 62%
rename from lms/djangoapps/pocs/migrations/0001_initial.py
rename to lms/djangoapps/ccx/migrations/0001_initial.py
index 4572bf8991..80eb4a2cc4 100644
--- a/lms/djangoapps/pocs/migrations/0001_initial.py
+++ b/lms/djangoapps/ccx/migrations/0001_initial.py
@@ -8,49 +8,62 @@ from django.db import models
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        # Adding model 'PersonalOnlineCourse'
-        db.create_table('pocs_personalonlinecourse', (
+        # Adding model 'CustomCourseForEdX'
+        db.create_table('ccx_customcourseforedx', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('course_id', self.gf('xmodule_django.models.CourseKeyField')(max_length=255, db_index=True)),
             ('display_name', self.gf('django.db.models.fields.CharField')(max_length=255)),
             ('coach', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
         ))
-        db.send_create_signal('pocs', ['PersonalOnlineCourse'])
+        db.send_create_signal('ccx', ['CustomCourseForEdX'])
 
-        # Adding model 'PocMembership'
-        db.create_table('pocs_pocmembership', (
+        # Adding model 'CcxMembership'
+        db.create_table('ccx_ccxmembership', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('poc', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['pocs.PersonalOnlineCourse'])),
+            ('ccx', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ccx.CustomCourseForEdX'])),
             ('student', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('active', self.gf('django.db.models.fields.BooleanField')(default=False)),
         ))
-        db.send_create_signal('pocs', ['PocMembership'])
+        db.send_create_signal('ccx', ['CcxMembership'])
 
-        # Adding model 'PocFieldOverride'
-        db.create_table('pocs_pocfieldoverride', (
+        # Adding model 'CcxFutureMembership'
+        db.create_table('ccx_ccxfuturemembership', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('poc', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['pocs.PersonalOnlineCourse'])),
+            ('ccx', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ccx.CustomCourseForEdX'])),
+            ('email', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('auto_enroll', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('ccx', ['CcxFutureMembership'])
+
+        # Adding model 'CcxFieldOverride'
+        db.create_table('ccx_ccxfieldoverride', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('ccx', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ccx.CustomCourseForEdX'])),
             ('location', self.gf('xmodule_django.models.LocationKeyField')(max_length=255, db_index=True)),
             ('field', self.gf('django.db.models.fields.CharField')(max_length=255)),
             ('value', self.gf('django.db.models.fields.TextField')(default='null')),
         ))
-        db.send_create_signal('pocs', ['PocFieldOverride'])
+        db.send_create_signal('ccx', ['CcxFieldOverride'])
 
-        # Adding unique constraint on 'PocFieldOverride', fields ['poc', 'location', 'field']
-        db.create_unique('pocs_pocfieldoverride', ['poc_id', 'location', 'field'])
+        # Adding unique constraint on 'CcxFieldOverride', fields ['ccx', 'location', 'field']
+        db.create_unique('ccx_ccxfieldoverride', ['ccx_id', 'location', 'field'])
 
 
     def backwards(self, orm):
-        # Removing unique constraint on 'PocFieldOverride', fields ['poc', 'location', 'field']
-        db.delete_unique('pocs_pocfieldoverride', ['poc_id', 'location', 'field'])
+        # Removing unique constraint on 'CcxFieldOverride', fields ['ccx', 'location', 'field']
+        db.delete_unique('ccx_ccxfieldoverride', ['ccx_id', 'location', 'field'])
 
-        # Deleting model 'PersonalOnlineCourse'
-        db.delete_table('pocs_personalonlinecourse')
+        # Deleting model 'CustomCourseForEdX'
+        db.delete_table('ccx_customcourseforedx')
 
-        # Deleting model 'PocMembership'
-        db.delete_table('pocs_pocmembership')
+        # Deleting model 'CcxMembership'
+        db.delete_table('ccx_ccxmembership')
 
-        # Deleting model 'PocFieldOverride'
-        db.delete_table('pocs_pocfieldoverride')
+        # Deleting model 'CcxFutureMembership'
+        db.delete_table('ccx_ccxfuturemembership')
+
+        # Deleting model 'CcxFieldOverride'
+        db.delete_table('ccx_ccxfieldoverride')
 
 
     models = {
@@ -83,34 +96,42 @@ class Migration(SchemaMigration):
             'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
             'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
         },
+        'ccx.ccxfieldoverride': {
+            'Meta': {'unique_together': "(('ccx', 'location', 'field'),)", 'object_name': 'CcxFieldOverride'},
+            'ccx': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ccx.CustomCourseForEdX']"}),
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'ccx.ccxfuturemembership': {
+            'Meta': {'object_name': 'CcxFutureMembership'},
+            'auto_enroll': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ccx': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ccx.CustomCourseForEdX']"}),
+            'email': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'ccx.ccxmembership': {
+            'Meta': {'object_name': 'CcxMembership'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ccx': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ccx.CustomCourseForEdX']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'ccx.customcourseforedx': {
+            'Meta': {'object_name': 'CustomCourseForEdX'},
+            'coach': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
         'contenttypes.contenttype': {
             'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
             'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'pocs.personalonlinecourse': {
-            'Meta': {'object_name': 'PersonalOnlineCourse'},
-            'coach': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
-            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
-            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'pocs.pocfieldoverride': {
-            'Meta': {'unique_together': "(('poc', 'location', 'field'),)", 'object_name': 'PocFieldOverride'},
-            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
-            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
-            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
-        },
-        'pocs.pocmembership': {
-            'Meta': {'object_name': 'PocMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
-            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         }
     }
 
-    complete_apps = ['pocs']
\ No newline at end of file
+    complete_apps = ['ccx']
\ No newline at end of file
diff --git a/lms/djangoapps/pocs/migrations/__init__.py b/lms/djangoapps/ccx/migrations/__init__.py
similarity index 100%
rename from lms/djangoapps/pocs/migrations/__init__.py
rename to lms/djangoapps/ccx/migrations/__init__.py
diff --git a/lms/djangoapps/pocs/models.py b/lms/djangoapps/ccx/models.py
similarity index 68%
rename from lms/djangoapps/pocs/models.py
rename to lms/djangoapps/ccx/models.py
index a6ec42e006..835c5403d4 100644
--- a/lms/djangoapps/pocs/models.py
+++ b/lms/djangoapps/ccx/models.py
@@ -5,20 +5,20 @@ from student.models import CourseEnrollment, AlreadyEnrolledError
 from xmodule_django.models import CourseKeyField, LocationKeyField
 
 
-class PersonalOnlineCourse(models.Model):
+class CustomCourseForEdX(models.Model):
     """
-    A Personal Online Course.
+    A Custom Course.
     """
     course_id = CourseKeyField(max_length=255, db_index=True)
     display_name = models.CharField(max_length=255)
     coach = models.ForeignKey(User, db_index=True)
 
 
-class PocMembership(models.Model):
+class CcxMembership(models.Model):
     """
-    Which students are in a POC?
+    Which students are in a CCX?
     """
-    poc = models.ForeignKey(PersonalOnlineCourse, db_index=True)
+    ccx = models.ForeignKey(CustomCourseForEdX, db_index=True)
     student = models.ForeignKey(User, db_index=True)
     active = models.BooleanField(default=False)
 
@@ -30,11 +30,11 @@ class PocMembership(models.Model):
             msg = "auto enrollment not allowed for {}"
             raise ValueError(msg.format(future_membership))
         membership = cls(
-            poc=future_membership.poc, student=student, active=True
+            ccx=future_membership.ccx, student=student, active=True
         )
         try:
             CourseEnrollment.enroll(
-                student, future_membership.poc.course_id, check_access=True
+                student, future_membership.ccx.course_id, check_access=True
             )
         except AlreadyEnrolledError:
             # if the user is already enrolled in the course, great!
@@ -48,24 +48,24 @@ class PocMembership(models.Model):
         return cls.objects.filter(student=user, active__exact=active)
 
 
-class PocFutureMembership(models.Model):
+class CcxFutureMembership(models.Model):
     """
-    Which emails for non-users are waiting to be added to POC on registration
+    Which emails for non-users are waiting to be added to CCX on registration
     """
-    poc = models.ForeignKey(PersonalOnlineCourse, db_index=True)
+    ccx = models.ForeignKey(CustomCourseForEdX, db_index=True)
     email = models.CharField(max_length=255)
     auto_enroll = models.BooleanField(default=0)
 
 
-class PocFieldOverride(models.Model):
+class CcxFieldOverride(models.Model):
     """
-    Field overrides for personal online courses.
+    Field overrides for custom courses.
     """
-    poc = models.ForeignKey(PersonalOnlineCourse, db_index=True)
+    ccx = models.ForeignKey(CustomCourseForEdX, db_index=True)
     location = LocationKeyField(max_length=255, db_index=True)
     field = models.CharField(max_length=255)
 
     class Meta:
-        unique_together = (('poc', 'location', 'field'),)
+        unique_together = (('ccx', 'location', 'field'),)
 
     value = models.TextField(default='null')
diff --git a/lms/djangoapps/ccx/overrides.py b/lms/djangoapps/ccx/overrides.py
new file mode 100644
index 0000000000..88e04d7b36
--- /dev/null
+++ b/lms/djangoapps/ccx/overrides.py
@@ -0,0 +1,159 @@
+"""
+API related to providing field overrides for individual students.  This is used
+by the individual due dates feature.
+"""
+import json
+import threading
+
+from contextlib import contextmanager
+
+from courseware.field_overrides import FieldOverrideProvider
+from ccx import ACTIVE_CCX_KEY
+
+from .models import CcxMembership, CcxFieldOverride
+
+
+class CustomCoursesForEdxOverrideProvider(FieldOverrideProvider):
+    """
+    A concrete implementation of
+    :class:`~courseware.field_overrides.FieldOverrideProvider` which allows for
+    overrides to be made on a per user basis.
+    """
+    def get(self, block, name, default):
+        ccx = get_current_ccx()
+        if ccx:
+            return get_override_for_ccx(ccx, block, name, default)
+        return default
+
+
+class _CcxContext(threading.local):
+    """
+    A threading local used to implement the `with_ccx` context manager, that
+    keeps track of the CCX currently set as the context.
+    """
+    ccx = None
+
+
+_CCX_CONTEXT = _CcxContext()
+
+
+@contextmanager
+def ccx_context(ccx):
+    """
+    A context manager which can be used to explicitly set the CCX that is in
+    play for field overrides.  This mechanism overrides the standard mechanism
+    of looking in the user's session to see if they are enrolled in a CCX and
+    viewing that CCX.
+    """
+    prev = _CCX_CONTEXT.ccx
+    _CCX_CONTEXT.ccx = ccx
+    yield
+    _CCX_CONTEXT.ccx = prev
+
+
+def get_current_ccx():
+    """
+    Return the ccx that is active for this request.
+    """
+    ccx = _CCX_CONTEXT.ccx
+    if ccx:
+        return ccx
+
+
+def get_override_for_ccx(ccx, block, name, default=None):
+    """
+    Gets the value of the overridden field for the `ccx`.  `block` and `name`
+    specify the block and the name of the field.  If the field is not
+    overridden for the given ccx, returns `default`.
+    """
+    if not hasattr(block, '_ccx_overrides'):
+        block._ccx_overrides = {}
+    overrides = block._ccx_overrides.get(ccx.id)
+    if overrides is None:
+        overrides = _get_overrides_for_ccx(ccx, block)
+        block._ccx_overrides[ccx.id] = overrides
+    return overrides.get(name, default)
+
+
+def _get_overrides_for_ccx(ccx, block):
+    """
+    Returns a dictionary mapping field name to overriden value for any
+    overrides set on this block for this CCX.
+    """
+    overrides = {}
+    query = CcxFieldOverride.objects.filter(
+        ccx=ccx,
+        location=block.location
+    )
+    for override in query:
+        field = block.fields[override.field]
+        value = field.from_json(json.loads(override.value))
+        overrides[override.field] = value
+    return overrides
+
+
+def override_field_for_ccx(ccx, block, name, value):
+    """
+    Overrides a field for the `ccx`.  `block` and `name` specify the block
+    and the name of the field on that block to override.  `value` is the
+    value to set for the given field.
+    """
+    override, created = CcxFieldOverride.objects.get_or_create(
+        ccx=ccx,
+        location=block.location,
+        field=name)
+    field = block.fields[name]
+    override.value = json.dumps(field.to_json(value))
+    override.save()
+
+    if hasattr(block, '_ccx_overrides'):
+        del block._ccx_overrides[ccx.id]
+
+
+def clear_override_for_ccx(ccx, block, name):
+    """
+    Clears a previously set field override for the `ccx`.  `block` and `name`
+    specify the block and the name of the field on that block to clear.
+    This function is idempotent--if no override is set, nothing action is
+    performed.
+    """
+    try:
+        CcxFieldOverride.objects.get(
+            ccx=ccx,
+            location=block.location,
+            field=name).delete()
+
+        if hasattr(block, '_ccx_overrides'):
+            del block._ccx_overrides[ccx.id]
+
+    except CcxFieldOverride.DoesNotExist:
+        pass
+
+
+class CcxMiddleware(object):
+    """
+    Checks to see if current session is examining a CCX and sets the CCX as
+    the current CCX for the override machinery if so.
+    """
+    def process_request(self, request):
+        """
+        Do the check.
+        """
+        ccx_id = request.session.get(ACTIVE_CCX_KEY, None)
+        if ccx_id is not None:
+            try:
+                membership = CcxMembership.objects.get(
+                    student=request.user, active=True, ccx__id__exact=ccx_id
+                )
+                _CCX_CONTEXT.ccx = membership.ccx
+            except CcxMembership.DoesNotExist:
+                # if there is no membership, be sure to unset the active ccx
+                _CCX_CONTEXT.ccx = None
+                request.session.pop(ACTIVE_CCX_KEY)
+
+    def process_response(self, request, response):
+        """
+        Clean up afterwards.
+        """
+        _CCX_CONTEXT.ccx = None
+        return response
diff --git a/lms/djangoapps/pocs/tests/__init__.py b/lms/djangoapps/ccx/tests/__init__.py
similarity index 100%
rename from lms/djangoapps/pocs/tests/__init__.py
rename to lms/djangoapps/ccx/tests/__init__.py
diff --git a/lms/djangoapps/ccx/tests/factories.py b/lms/djangoapps/ccx/tests/factories.py
new file mode 100644
index 0000000000..694a547b1a
--- /dev/null
+++ b/lms/djangoapps/ccx/tests/factories.py
@@ -0,0 +1,18 @@
+from factory.django import DjangoModelFactory
+from ccx.models import CustomCourseForEdX
+from ccx.models import CcxMembership
+from ccx.models import CcxFutureMembership
+
+
+class CcxFactory(DjangoModelFactory):
+    FACTORY_FOR = CustomCourseForEdX
+    display_name = "Test CCX"
+
+
+class CcxMembershipFactory(DjangoModelFactory):
+    FACTORY_FOR = CcxMembership
+    active = False
+
+
+class CcxFutureMembershipFactory(DjangoModelFactory):
+    FACTORY_FOR = CcxFutureMembership
diff --git a/lms/djangoapps/pocs/tests/test_models.py b/lms/djangoapps/ccx/tests/test_models.py
similarity index 59%
rename from lms/djangoapps/pocs/tests/test_models.py
rename to lms/djangoapps/ccx/tests/test_models.py
index b12303fae2..9c164c1fc3 100644
--- a/lms/djangoapps/pocs/tests/test_models.py
+++ b/lms/djangoapps/ccx/tests/test_models.py
@@ -1,5 +1,5 @@
 from student.models import CourseEnrollment
-from student.roles import CoursePocCoachRole
+from student.roles import CourseCcxCoachRole
 from student.tests.factories import (
     AdminFactory,
     CourseEnrollmentFactory,
@@ -9,34 +9,35 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
 from .factories import (
-    PocFactory,
-    PocMembershipFactory,
-    PocFutureMembershipFactory,
+    CcxFactory,
+    CcxMembershipFactory,
+    CcxFutureMembershipFactory,
 )
 from ..models import (
-    PocMembership,
-    PocFutureMembership,
+    CcxMembership,
+    CcxFutureMembership,
 )
 
 
-class TestPocMembership(ModuleStoreTestCase):
-    """Unit tests for the PocMembership model
+class TestCcxMembership(ModuleStoreTestCase):
+    """Unit tests for the CcxMembership model
     """
 
     def setUp(self):
         """common setup for all tests"""
+        super(TestCcxMembership, self).setUp()
         self.course = course = CourseFactory.create()
         coach = AdminFactory.create()
-        role = CoursePocCoachRole(course.id)
+        role = CourseCcxCoachRole(course.id)
         role.add_users(coach)
-        self.poc = PocFactory(course_id=course.id, coach=coach)
+        self.ccx = CcxFactory(course_id=course.id, coach=coach)
         enrollment = CourseEnrollmentFactory.create(course_id=course.id)
         self.enrolled_user = enrollment.user
         self.unenrolled_user = UserFactory.create()
 
     def create_future_enrollment(self, user, auto_enroll=True):
-        pfm = PocFutureMembershipFactory.create(
-            poc=self.poc,
+        pfm = CcxFutureMembershipFactory.create(
+            ccx=self.ccx,
             email=user.email,
             auto_enroll=auto_enroll
         )
@@ -48,62 +49,62 @@ class TestPocMembership(ModuleStoreTestCase):
         )
         return enrollment.exists()
 
-    def has_poc_membership(self, user):
-        membership = PocMembership.objects.filter(
-            student=user, poc=self.poc, active=True
+    def has_ccx_membership(self, user):
+        membership = CcxMembership.objects.filter(
+            student=user, ccx=self.ccx, active=True
         )
         return membership.exists()
 
-    def has_poc_future_membership(self, user):
-        future_membership = PocFutureMembership.objects.filter(
-            email=user.email, poc=self.poc
+    def has_ccx_future_membership(self, user):
+        future_membership = CcxFutureMembership.objects.filter(
+            email=user.email, ccx=self.ccx
         )
         return future_membership.exists()
 
     def call_MUT(self, student, future_membership):
-        PocMembership.auto_enroll(student, future_membership)
+        CcxMembership.auto_enroll(student, future_membership)
 
-    def test_poc_auto_enroll_unregistered_user(self):
+    def test_ccx_auto_enroll_unregistered_user(self):
         """verify auto_enroll works when user is not enrolled in the MOOC
 
         n.b.  After auto_enroll, user will have both a MOOC enrollment and a
-              POC membership
+              CCX membership
         """
         user = self.unenrolled_user
         pfm = self.create_future_enrollment(user)
-        self.assertTrue(self.has_poc_future_membership(user))
+        self.assertTrue(self.has_ccx_future_membership(user))
         self.assertFalse(self.has_course_enrollment(user))
         # auto_enroll user
         self.call_MUT(user, pfm)
 
         self.assertTrue(self.has_course_enrollment(user))
-        self.assertTrue(self.has_poc_membership(user))
-        self.assertFalse(self.has_poc_future_membership(user))
+        self.assertTrue(self.has_ccx_membership(user))
+        self.assertFalse(self.has_ccx_future_membership(user))
 
-    def test_poc_auto_enroll_registered_user(self):
+    def test_ccx_auto_enroll_registered_user(self):
         """verify auto_enroll works when user is enrolled in the MOOC
         """
         user = self.enrolled_user
         pfm = self.create_future_enrollment(user)
-        self.assertTrue(self.has_poc_future_membership(user))
+        self.assertTrue(self.has_ccx_future_membership(user))
         self.assertTrue(self.has_course_enrollment(user))
 
         self.call_MUT(user, pfm)
 
         self.assertTrue(self.has_course_enrollment(user))
-        self.assertTrue(self.has_poc_membership(user))
-        self.assertFalse(self.has_poc_future_membership(user))
+        self.assertTrue(self.has_ccx_membership(user))
+        self.assertFalse(self.has_ccx_future_membership(user))
 
     def test_future_membership_disallows_auto_enroll(self):
-        """verify that the PocFutureMembership can veto auto_enroll
+        """verify that the CcxFutureMembership can veto auto_enroll
         """
         user = self.unenrolled_user
         pfm = self.create_future_enrollment(user, auto_enroll=False)
-        self.assertTrue(self.has_poc_future_membership(user))
+        self.assertTrue(self.has_ccx_future_membership(user))
         self.assertFalse(self.has_course_enrollment(user))
 
         self.assertRaises(ValueError, self.call_MUT, user, pfm)
 
         self.assertFalse(self.has_course_enrollment(user))
-        self.assertFalse(self.has_poc_membership(user))
-        self.assertTrue(self.has_poc_future_membership(user))
+        self.assertFalse(self.has_ccx_membership(user))
+        self.assertTrue(self.has_ccx_future_membership(user))
diff --git a/lms/djangoapps/pocs/tests/test_overrides.py b/lms/djangoapps/ccx/tests/test_overrides.py
similarity index 71%
rename from lms/djangoapps/pocs/tests/test_overrides.py
rename to lms/djangoapps/ccx/tests/test_overrides.py
index 4a8178768f..875a1c0249 100644
--- a/lms/djangoapps/pocs/tests/test_overrides.py
+++ b/lms/djangoapps/ccx/tests/test_overrides.py
@@ -8,12 +8,12 @@ from student.tests.factories import AdminFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 
-from ..models import PersonalOnlineCourse
-from ..overrides import override_field_for_poc
+from ..models import CustomCourseForEdX
+from ..overrides import override_field_for_ccx
 
 
 @override_settings(FIELD_OVERRIDE_PROVIDERS=(
-    'pocs.overrides.PersonalOnlineCoursesOverrideProvider',))
+    'ccx.overrides.CustomCoursesForEdxOverrideProvider',))
 class TestFieldOverrides(ModuleStoreTestCase):
     """
     Make sure field overrides behave in the expected manner.
@@ -22,6 +22,7 @@ class TestFieldOverrides(ModuleStoreTestCase):
         """
         Set up tests
         """
+        super(TestFieldOverrides, self).setUp()
         self.course = course = CourseFactory.create()
 
         # Create a course outline
@@ -41,15 +42,15 @@ class TestFieldOverrides(ModuleStoreTestCase):
             [ItemFactory.create(parent=vertical) for _ in xrange(2)]
             for vertical in verticals])
 
-        self.poc = poc = PersonalOnlineCourse(
+        self.ccx = ccx = CustomCourseForEdX(
             course_id=course.id,
-            display_name='Test POC',
+            display_name='Test CCX',
             coach=AdminFactory.create())
-        poc.save()
+        ccx.save()
 
-        patch = mock.patch('pocs.overrides.get_current_poc')
-        self.get_poc = get_poc = patch.start()
-        get_poc.return_value = poc
+        patch = mock.patch('ccx.overrides.get_current_ccx')
+        self.get_ccx = get_ccx = patch.start()
+        get_ccx.return_value = ccx
         self.addCleanup(patch.stop)
 
         # Apparently the test harness doesn't use LmsFieldStorage, and I'm not
@@ -60,24 +61,30 @@ class TestFieldOverrides(ModuleStoreTestCase):
             block._field_data = OverrideFieldData.wrap(  # pylint: disable=protected-access
                 AdminFactory.create(), block._field_data)  # pylint: disable=protected-access
 
+        # and after everything is done, clean up by un-doing the change to the
+        # OverrideFieldData object that is done during the wrap method.
+        def cleanup_provider_classes():
+            OverrideFieldData.provider_classes = None
+        self.addCleanup(cleanup_provider_classes)
+
     def test_override_start(self):
         """
         Test that overriding start date on a chapter works.
         """
-        poc_start = datetime.datetime(2014, 12, 25, 00, 00, tzinfo=pytz.UTC)
+        ccx_start = datetime.datetime(2014, 12, 25, 00, 00, tzinfo=pytz.UTC)
         chapter = self.course.get_children()[0]
-        override_field_for_poc(self.poc, chapter, 'start', poc_start)
-        self.assertEquals(chapter.start, poc_start)
+        override_field_for_ccx(self.ccx, chapter, 'start', ccx_start)
+        self.assertEquals(chapter.start, ccx_start)
 
     def test_override_is_inherited(self):
         """
         Test that sequentials inherit overridden start date from chapter.
         """
-        poc_start = datetime.datetime(2014, 12, 25, 00, 00, tzinfo=pytz.UTC)
+        ccx_start = datetime.datetime(2014, 12, 25, 00, 00, tzinfo=pytz.UTC)
         chapter = self.course.get_children()[0]
-        override_field_for_poc(self.poc, chapter, 'start', poc_start)
-        self.assertEquals(chapter.get_children()[0].start, poc_start)
-        self.assertEquals(chapter.get_children()[1].start, poc_start)
+        override_field_for_ccx(self.ccx, chapter, 'start', ccx_start)
+        self.assertEquals(chapter.get_children()[0].start, ccx_start)
+        self.assertEquals(chapter.get_children()[1].start, ccx_start)
 
     def test_override_is_inherited_even_if_set_in_mooc(self):
         """
@@ -85,12 +92,12 @@ class TestFieldOverrides(ModuleStoreTestCase):
         (verticals) even if a due date is set explicitly on grandchildren in
         the mooc.
         """
-        poc_due = datetime.datetime(2015, 1, 1, 00, 00, tzinfo=pytz.UTC)
+        ccx_due = datetime.datetime(2015, 1, 1, 00, 00, tzinfo=pytz.UTC)
         chapter = self.course.get_children()[0]
         chapter.display_name = 'itsme!'
-        override_field_for_poc(self.poc, chapter, 'due', poc_due)
+        override_field_for_ccx(self.ccx, chapter, 'due', ccx_due)
         vertical = chapter.get_children()[0].get_children()[0]
-        self.assertEqual(vertical.due, poc_due)
+        self.assertEqual(vertical.due, ccx_due)
 
 
 def flatten(seq):
diff --git a/lms/djangoapps/pocs/tests/test_utils.py b/lms/djangoapps/ccx/tests/test_utils.py
similarity index 75%
rename from lms/djangoapps/pocs/tests/test_utils.py
rename to lms/djangoapps/ccx/tests/test_utils.py
index 148f75a377..764dfca2ad 100644
--- a/lms/djangoapps/pocs/tests/test_utils.py
+++ b/lms/djangoapps/ccx/tests/test_utils.py
@@ -1,13 +1,13 @@
-from pocs.models import (
-    PocMembership,
-    PocFutureMembership,
+from ccx.models import (
+    CcxMembership,
+    CcxFutureMembership,
 )
-from pocs.tests.factories import (
-    PocFactory,
-    PocMembershipFactory,
-    PocFutureMembershipFactory,
+from ccx.tests.factories import (
+    CcxFactory,
+    CcxMembershipFactory,
+    CcxFutureMembershipFactory,
 )
-from student.roles import CoursePocCoachRole
+from student.roles import CourseCcxCoachRole
 from student.tests.factories import (
     AdminFactory,
     UserFactory,
@@ -26,11 +26,15 @@ class TestEmailEnrollmentState(ModuleStoreTestCase):
         """
         Set up tests
         """
+        super(TestEmailEnrollmentState, self).setUp()
+        # remove user provided by the parent test case so we can make our own
+        # when needed.
+        self.user = None
         course = CourseFactory.create()
         coach = AdminFactory.create()
-        role = CoursePocCoachRole(course.id)
+        role = CourseCcxCoachRole(course.id)
         role.add_users(coach)
-        self.poc = PocFactory(course_id=course.id, coach=coach)
+        self.ccx = CcxFactory(course_id=course.id, coach=coach)
 
     def create_user(self):
         """provide a legitimate django user for testing
@@ -38,47 +42,47 @@ class TestEmailEnrollmentState(ModuleStoreTestCase):
         if getattr(self, 'user', None) is None:
             self.user = UserFactory()
 
-    def register_user_in_poc(self):
-        """create registration of self.user in self.poc
+    def register_user_in_ccx(self):
+        """create registration of self.user in self.ccx
 
         registration will be inactive
         """
         self.create_user()
-        PocMembershipFactory(poc=self.poc, student=self.user)
+        CcxMembershipFactory(ccx=self.ccx, student=self.user)
 
     def create_one(self, email=None):
         """Create a single EmailEnrollmentState object and return it
         """
-        from pocs.utils import EmailEnrollmentState
+        from ccx.utils import EmailEnrollmentState
         if email is None:
             email = self.user.email
-        return EmailEnrollmentState(self.poc, email)
+        return EmailEnrollmentState(self.ccx, email)
 
     def test_enrollment_state_for_non_user(self):
         """verify behavior for non-user email address
         """
         ee_state = self.create_one(email='nobody@nowhere.com')
-        for attr in ['user', 'member', 'full_name', 'in_poc']:
+        for attr in ['user', 'member', 'full_name', 'in_ccx']:
             value = getattr(ee_state, attr, 'missing attribute')
             self.assertFalse(value, "{}: {}".format(value, attr))
 
     def test_enrollment_state_for_non_member_user(self):
-        """verify behavior for email address of user who is not a poc memeber
+        """verify behavior for email address of user who is not a ccx memeber
         """
         self.create_user()
         ee_state = self.create_one()
         self.assertTrue(ee_state.user)
-        self.assertFalse(ee_state.in_poc)
+        self.assertFalse(ee_state.in_ccx)
         self.assertEqual(ee_state.member, self.user)
         self.assertEqual(ee_state.full_name, self.user.profile.name)
 
     def test_enrollment_state_for_member_user(self):
-        """verify behavior for email address of user who is a poc member
+        """verify behavior for email address of user who is a ccx member
         """
         self.create_user()
-        self.register_user_in_poc()
+        self.register_user_in_ccx()
         ee_state = self.create_one()
-        for attr in ['user', 'in_poc']:
+        for attr in ['user', 'in_ccx']:
             self.assertTrue(
                 getattr(ee_state, attr, False),
                 "attribute {} is missing or False".format(attr)
@@ -90,13 +94,13 @@ class TestEmailEnrollmentState(ModuleStoreTestCase):
         """verify dict representation of EmailEnrollmentState
         """
         self.create_user()
-        self.register_user_in_poc()
+        self.register_user_in_ccx()
         ee_state = self.create_one()
         ee_dict = ee_state.to_dict()
         expected = {
             'user': True,
             'member': self.user,
-            'in_poc': True,
+            'in_ccx': True,
         }
         for expected_key, expected_value in expected.iteritems():
             self.assertTrue(expected_key in ee_dict)
@@ -104,28 +108,29 @@ class TestEmailEnrollmentState(ModuleStoreTestCase):
 
     def test_enrollment_state_repr(self):
         self.create_user()
-        self.register_user_in_poc()
+        self.register_user_in_ccx()
         ee_state = self.create_one()
         representation = repr(ee_state)
         self.assertTrue('user=True' in representation)
-        self.assertTrue('in_poc=True' in representation)
+        self.assertTrue('in_ccx=True' in representation)
         member = 'member={}'.format(self.user)
         self.assertTrue(member in representation)
 
 
 # TODO: deal with changes in behavior for auto_enroll
 class TestGetEmailParams(ModuleStoreTestCase):
-    """tests for pocs.utils.get_email_params
+    """tests for ccx.utils.get_email_params
     """
     def setUp(self):
         """
         Set up tests
         """
+        super(TestGetEmailParams, self).setUp()
         course = CourseFactory.create()
         coach = AdminFactory.create()
-        role = CoursePocCoachRole(course.id)
+        role = CourseCcxCoachRole(course.id)
         role.add_users(coach)
-        self.poc = PocFactory(course_id=course.id, coach=coach)
+        self.ccx = CcxFactory(course_id=course.id, coach=coach)
         self.all_keys = [
             'site_name', 'course', 'course_url', 'registration_url',
             'course_about_url', 'auto_enroll'
@@ -134,17 +139,17 @@ class TestGetEmailParams(ModuleStoreTestCase):
         self.course_keys = [k for k in self.url_keys if 'course' in k]
 
     def call_FUT(self, auto_enroll=False, secure=False):
-        from pocs.utils import get_email_params
-        return get_email_params(self.poc, auto_enroll, secure)
+        from ccx.utils import get_email_params
+        return get_email_params(self.ccx, auto_enroll, secure)
 
     def test_params_have_expected_keys(self):
         params = self.call_FUT()
         self.assertFalse(set(params.keys()) - set(self.all_keys))
 
-    def test_poc_id_in_params(self):
-        expected_course_id = self.poc.course_id.to_deprecated_string()
+    def test_ccx_id_in_params(self):
+        expected_course_id = self.ccx.course_id.to_deprecated_string()
         params = self.call_FUT()
-        self.assertEqual(params['course'], self.poc)
+        self.assertEqual(params['course'], self.ccx)
         for url_key in self.url_keys:
             self.assertTrue('http://' in params[url_key])
         for url_key in self.course_keys:
@@ -167,14 +172,18 @@ class TestGetEmailParams(ModuleStoreTestCase):
 
 # TODO: deal with changes in behavior for auto_enroll
 class TestEnrollEmail(ModuleStoreTestCase):
-    """tests for the enroll_email function from pocs.utils
+    """tests for the enroll_email function from ccx.utils
     """
     def setUp(self):
+        super(TestEnrollEmail, self).setUp()
+        # unbind the user created by the parent, so we can create our own when
+        # needed.
+        self.user = None
         course = CourseFactory.create()
         coach = AdminFactory.create()
-        role = CoursePocCoachRole(course.id)
+        role = CourseCcxCoachRole(course.id)
         role.add_users(coach)
-        self.poc = PocFactory(course_id=course.id, coach=coach)
+        self.ccx = CcxFactory(course_id=course.id, coach=coach)
         self.outbox = self.get_outbox()
 
     def create_user(self):
@@ -183,13 +192,13 @@ class TestEnrollEmail(ModuleStoreTestCase):
         if getattr(self, 'user', None) is None:
             self.user = UserFactory()
 
-    def register_user_in_poc(self):
-        """create registration of self.user in self.poc
+    def register_user_in_ccx(self):
+        """create registration of self.user in self.ccx
 
         registration will be inactive
         """
         self.create_user()
-        PocMembershipFactory(poc=self.poc, student=self.user)
+        CcxMembershipFactory(ccx=self.ccx, student=self.user)
 
     def get_outbox(self):
         """Return the django mail outbox"""
@@ -197,31 +206,31 @@ class TestEnrollEmail(ModuleStoreTestCase):
         return mail.outbox
 
     def check_membership(self, email=None, user=None, future=False):
-        """Verify tjat an appropriate Poc Membership exists"""
+        """Verify tjat an appropriate CCX Membership exists"""
         if not email and not user:
             self.fail(
-                "must provide user or email address to check Poc Membership"
+                "must provide user or email address to check CCX Membership"
             )
         if future and email:
-            membership = PocFutureMembership.objects.filter(
-                poc=self.poc, email=email
+            membership = CcxFutureMembership.objects.filter(
+                ccx=self.ccx, email=email
             )
         elif not future:
             if not user:
                 user = self.user
-            membership = PocMembership.objects.filter(
-                poc=self.poc, student=user
+            membership = CcxMembership.objects.filter(
+                ccx=self.ccx, student=user
             )
         self.assertTrue(membership.exists())
 
-    def check_enrollment_state(self, state, in_poc, member, user):
+    def check_enrollment_state(self, state, in_ccx, member, user):
         """Verify an enrollment state object against provided arguments
 
-        state.in_poc will always be a boolean
+        state.in_ccx will always be a boolean
         state.user will always be a boolean
         state.member will be a Django user object or None
         """
-        self.assertEqual(in_poc, state.in_poc)
+        self.assertEqual(in_ccx, state.in_ccx)
         self.assertEqual(member, state.member)
         self.assertEqual(user, state.user)
 
@@ -232,11 +241,11 @@ class TestEnrollEmail(ModuleStoreTestCase):
         email_students=False,
         email_params=None
     ):
-        from pocs.utils import enroll_email
+        from ccx.utils import enroll_email
         if student_email is None:
             student_email = self.user.email
         before, after = enroll_email(
-            self.poc, student_email, auto_enroll, email_students, email_params
+            self.ccx, student_email, auto_enroll, email_students, email_params
         )
         return before, after
 
@@ -279,7 +288,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
     def test_enroll_member_sending_email(self):
         """register a member and send an enrollment email to them
         """
-        self.register_user_in_poc()
+        self.register_user_in_ccx()
         # ensure no emails are in the outbox now
         self.assertEqual(len(self.outbox), 0)
         before, after = self.call_FUT(email_students=True)
@@ -327,7 +336,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
     def test_enroll_member_no_email(self):
         """enroll a member but send no email
         """
-        self.register_user_in_poc()
+        self.register_user_in_ccx()
         # ensure no emails are in the outbox now
         self.assertEqual(len(self.outbox), 0)
         before, after = self.call_FUT(email_students=False)
@@ -342,13 +351,17 @@ class TestEnrollEmail(ModuleStoreTestCase):
 
 # TODO: deal with changes in behavior for auto_enroll
 class TestUnenrollEmail(ModuleStoreTestCase):
-    """Tests for the unenroll_email function from pocs.utils"""
+    """Tests for the unenroll_email function from ccx.utils"""
     def setUp(self):
+        super(TestUnenrollEmail, self).setUp()
+        # unbind the user created by the parent, so we can create our own when
+        # needed.
+        self.user = None
         course = CourseFactory.create()
         coach = AdminFactory.create()
-        role = CoursePocCoachRole(course.id)
+        role = CourseCcxCoachRole(course.id)
         role.add_users(coach)
-        self.poc = PocFactory(course_id=course.id, coach=coach)
+        self.ccx = CcxFactory(course_id=course.id, coach=coach)
         self.outbox = self.get_outbox()
 
     def tearDown(self):
@@ -367,52 +380,52 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         if getattr(self, 'user', None) is None:
             self.user = UserFactory()
 
-    def make_poc_membership(self):
-        """create registration of self.user in self.poc
+    def make_ccx_membership(self):
+        """create registration of self.user in self.ccx
 
         registration will be inactive
         """
         self.create_user()
-        PocMembershipFactory.create(poc=self.poc, student=self.user)
+        CcxMembershipFactory.create(ccx=self.ccx, student=self.user)
 
-    def make_poc_future_membership(self):
-        """create future registration for email in self.poc"""
+    def make_ccx_future_membership(self):
+        """create future registration for email in self.ccx"""
         self.email = "nobody@nowhere.com"
-        PocFutureMembershipFactory.create(
-            poc=self.poc, email=self.email
+        CcxFutureMembershipFactory.create(
+            ccx=self.ccx, email=self.email
         )
 
-    def check_enrollment_state(self, state, in_poc, member, user):
+    def check_enrollment_state(self, state, in_ccx, member, user):
         """Verify an enrollment state object against provided arguments
 
-        state.in_poc will always be a boolean
+        state.in_ccx will always be a boolean
         state.user will always be a boolean
         state.member will be a Django user object or None
         """
-        self.assertEqual(in_poc, state.in_poc)
+        self.assertEqual(in_ccx, state.in_ccx)
         self.assertEqual(member, state.member)
         self.assertEqual(user, state.user)
 
     def check_membership(self, future=False):
         if future:
-            membership = PocFutureMembership.objects.filter(
-                poc=self.poc, email=self.email
+            membership = CcxFutureMembership.objects.filter(
+                ccx=self.ccx, email=self.email
             )
         else:
-            membership = PocMembership.objects.filter(
-                poc=self.poc, student=self.user
+            membership = CcxMembership.objects.filter(
+                ccx=self.ccx, student=self.user
             )
         return membership.exists()
 
     def call_FUT(self, email_students=False):
-        from pocs.utils import unenroll_email
-        email = hasattr(self, 'user') and self.user.email or self.email
-        return unenroll_email(self.poc, email, email_students=email_students)
+        from ccx.utils import unenroll_email
+        email = getattr(self, 'user', None) and self.user.email or self.email
+        return unenroll_email(self.ccx, email, email_students=email_students)
 
     def test_unenroll_future_member_with_email(self):
         """unenroll a future member and send an email
         """
-        self.make_poc_future_membership()
+        self.make_ccx_future_membership()
         # assert that a membership exists and that no emails have been sent
         self.assertTrue(self.check_membership(future=True))
         self.assertEqual(len(self.outbox), 0)
@@ -431,7 +444,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
 
     def test_unenroll_member_with_email(self):
         """unenroll a current member and send an email"""
-        self.make_poc_membership()
+        self.make_ccx_membership()
         # assert that a membership exists and that no emails have been sent
         self.assertTrue(self.check_membership())
         self.assertEqual(len(self.outbox), 0)
@@ -451,7 +464,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
     def test_unenroll_future_member_no_email(self):
         """unenroll a future member but send no email
         """
-        self.make_poc_future_membership()
+        self.make_ccx_future_membership()
         # assert that a membership exists and that no emails have been sent
         self.assertTrue(self.check_membership(future=True))
         self.assertEqual(len(self.outbox), 0)
@@ -469,7 +482,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
     def test_unenroll_member_no_email(self):
         """unenroll a current member but send no email
         """
-        self.make_poc_membership()
+        self.make_ccx_membership()
         # assert that a membership exists and that no emails have been sent
         self.assertTrue(self.check_membership())
         self.assertEqual(len(self.outbox), 0)
@@ -485,64 +498,65 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.assertEqual(len(self.outbox), 0)
 
 
-class TestUserPocList(ModuleStoreTestCase):
-    """Unit tests for poc.utils.get_all_pocs_for_user"""
+class TestUserCCXList(ModuleStoreTestCase):
+    """Unit tests for ccx.utils.get_all_ccx_for_user"""
 
     def setUp(self):
         """Create required infrastructure for tests"""
+        super(TestUserCCXList, self).setUp()
         self.course = CourseFactory.create()
         coach = AdminFactory.create()
-        role = CoursePocCoachRole(self.course.id)
+        role = CourseCcxCoachRole(self.course.id)
         role.add_users(coach)
-        self.poc = PocFactory(course_id=self.course.id, coach=coach)
+        self.ccx = CcxFactory(course_id=self.course.id, coach=coach)
         enrollment = CourseEnrollmentFactory.create(course_id=self.course.id)
         self.user = enrollment.user
         self.anonymous = AnonymousUserFactory.create()
 
-    def register_user_in_poc(self, active=False):
-        """create registration of self.user in self.poc
+    def register_user_in_ccx(self, active=False):
+        """create registration of self.user in self.ccx
 
         registration will be inactive unless active=True
         """
-        PocMembershipFactory(poc=self.poc, student=self.user, active=active)
+        CcxMembershipFactory(ccx=self.ccx, student=self.user, active=active)
 
     def get_course_title(self):
         from courseware.courses import get_course_about_section
         return get_course_about_section(self.course, 'title')
 
     def call_FUT(self, user):
-        from pocs.utils import get_all_pocs_for_user
-        return get_all_pocs_for_user(user)
+        from ccx.utils import get_all_ccx_for_user
+        return get_all_ccx_for_user(user)
 
-    def test_anonymous_sees_no_pocs(self):
+    def test_anonymous_sees_no_ccx(self):
         memberships = self.call_FUT(self.anonymous)
         self.assertEqual(len(memberships), 0)
 
-    def test_unenrolled_sees_no_pocs(self):
+    def test_unenrolled_sees_no_ccx(self):
         memberships = self.call_FUT(self.user)
         self.assertEqual(len(memberships), 0)
 
-    def test_enrolled_inactive_sees_no_pocs(self):
-        self.register_user_in_poc()
+    def test_enrolled_inactive_sees_no_ccx(self):
+        self.register_user_in_ccx()
         memberships = self.call_FUT(self.user)
         self.assertEqual(len(memberships), 0)
 
-    def test_enrolled_sees_a_poc(self):
-        self.register_user_in_poc(active=True)
+    def test_enrolled_sees_a_ccx(self):
+        self.register_user_in_ccx(active=True)
         memberships = self.call_FUT(self.user)
         self.assertEqual(len(memberships), 1)
 
     def test_data_structure(self):
-        self.register_user_in_poc(active=True)
+        self.register_user_in_ccx(active=True)
         memberships = self.call_FUT(self.user)
         this_membership = memberships[0]
         self.assertTrue(this_membership)
         # structure contains the expected keys
-        for key in ['poc_name', 'poc_url']:
+        for key in ['ccx_name', 'ccx_url']:
             self.assertTrue(key in this_membership.keys())
-        url_parts = [self.course.id.to_deprecated_string(), str(self.poc.id)]
-        # all parts of the poc url are present
+        url_parts = [self.course.id.to_deprecated_string(), str(self.ccx.id)]
+        # all parts of the ccx url are present
         for part in url_parts:
-            self.assertTrue(part in this_membership['poc_url'])
-        actual_name = self.poc.display_name
-        self.assertEqual(actual_name, this_membership['poc_name'])
+            self.assertTrue(part in this_membership['ccx_url'])
+        actual_name = self.ccx.display_name
+        self.assertEqual(actual_name, this_membership['ccx_name'])
diff --git a/lms/djangoapps/pocs/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py
similarity index 75%
rename from lms/djangoapps/pocs/tests/test_views.py
rename to lms/djangoapps/ccx/tests/test_views.py
index 47cb356f93..1b4cb1db69 100644
--- a/lms/djangoapps/pocs/tests/test_views.py
+++ b/lms/djangoapps/ccx/tests/test_views.py
@@ -11,7 +11,7 @@ from courseware.tests.helpers import LoginEnrollmentTestCase
 from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
 from edxmako.shortcuts import render_to_response
-from student.roles import CoursePocCoachRole
+from student.roles import CourseCcxCoachRole
 from student.tests.factories import (
     AdminFactory,
     CourseEnrollmentFactory,
@@ -23,18 +23,18 @@ from xmodule.modulestore.tests.factories import (
     CourseFactory,
     ItemFactory,
 )
-from pocs import ACTIVE_POC_KEY
+from ccx import ACTIVE_CCX_KEY
 from ..models import (
-    PersonalOnlineCourse,
-    PocMembership,
-    PocFutureMembership,
+    CustomCourseForEdX,
+    CcxMembership,
+    CcxFutureMembership,
 )
-from ..overrides import get_override_for_poc, override_field_for_poc
-from .. import ACTIVE_POC_KEY
+from ..overrides import get_override_for_ccx, override_field_for_ccx
+from .. import ACTIVE_CCX_KEY
 from .factories import (
-    PocFactory,
-    PocMembershipFactory,
-    PocFutureMembershipFactory,
+    CcxFactory,
+    CcxMembershipFactory,
+    CcxFutureMembershipFactory,
 )
 
 
@@ -54,12 +54,13 @@ def intercept_renderer(path, context):
 
 class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
-    Tests for Personal Online Courses views.
+    Tests for Custom Courses views.
     """
     def setUp(self):
         """
         Set up tests
         """
+        super(TestCoachDashboard, self).setUp()
         self.course = course = CourseFactory.create()
 
         # Create instructor account
@@ -89,12 +90,12 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
 
     def make_coach(self):
-        role = CoursePocCoachRole(self.course.id)
+        role = CourseCcxCoachRole(self.course.id)
         role.add_users(self.coach)
 
-    def make_poc(self):
-        poc = PocFactory(course_id=self.course.id, coach=self.coach)
-        return poc
+    def make_ccx(self):
+        ccx = CcxFactory(course_id=self.course.id, coach=self.coach)
+        return ccx
 
     def get_outbox(self):
         from django.core import mail
@@ -111,51 +112,51 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         User is not a coach, should get Forbidden response.
         """
         url = reverse(
-            'poc_coach_dashboard',
+            'ccx_coach_dashboard',
             kwargs={'course_id': self.course.id.to_deprecated_string()})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 403)
 
-    def test_no_poc_created(self):
+    def test_no_ccx_created(self):
         """
-        No POC is created, coach should see form to add a POC.
+        No CCX is created, coach should see form to add a CCX.
         """
         self.make_coach()
         url = reverse(
-            'poc_coach_dashboard',
+            'ccx_coach_dashboard',
             kwargs={'course_id': self.course.id.to_deprecated_string()})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertTrue(re.search(
-            '<form action=".+create_poc"',
+            '<form action=".+create_ccx"',
             response.content))
 
-    def test_create_poc(self):
+    def test_create_ccx(self):
         """
-        Create POC. Follow redirect to coach dashboard, confirm we see
-        the coach dashboard for the new POC.
+        Create CCX. Follow redirect to coach dashboard, confirm we see
+        the coach dashboard for the new CCX.
         """
         self.make_coach()
         url = reverse(
-            'create_poc',
+            'create_ccx',
             kwargs={'course_id': self.course.id.to_deprecated_string()})
-        response = self.client.post(url, {'name': 'New POC'})
+        response = self.client.post(url, {'name': 'New CCX'})
         self.assertEqual(response.status_code, 302)
         url = response.get('location')
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(re.search('id="poc-schedule"', response.content))
+        self.assertTrue(re.search('id="ccx-schedule"', response.content))
 
-    @patch('pocs.views.render_to_response', intercept_renderer)
-    @patch('pocs.views.TODAY')
+    @patch('ccx.views.render_to_response', intercept_renderer)
+    @patch('ccx.views.TODAY')
     def test_edit_schedule(self, today):
         """
-        Get POC schedule, modify it, save it.
+        Get CCX schedule, modify it, save it.
         """
         today.return_value = datetime.datetime(2014, 11, 25, tzinfo=pytz.UTC)
-        self.test_create_poc()
+        self.test_create_ccx()
         url = reverse(
-            'poc_coach_dashboard',
+            'ccx_coach_dashboard',
             kwargs={'course_id': self.course.id.to_deprecated_string()})
         response = self.client.get(url)
         schedule = json.loads(response.mako_context['schedule'])
@@ -170,12 +171,12 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
 
         url = reverse(
-            'save_poc',
+            'save_ccx',
             kwargs={'course_id': self.course.id.to_deprecated_string()})
 
         def unhide(unit):
             """
-            Recursively unhide a unit and all of its children in the POC
+            Recursively unhide a unit and all of its children in the CCX
             schedule.
             """
             unit['hidden'] = False
@@ -198,12 +199,12 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
 
         # Make sure start date set on course, follows start date of earliest
         # scheduled chapter
-        poc = PersonalOnlineCourse.objects.get()
-        course_start = get_override_for_poc(poc, self.course, 'start')
+        ccx = CustomCourseForEdX.objects.get()
+        course_start = get_override_for_ccx(ccx, self.course, 'start')
         self.assertEqual(str(course_start)[:-9], u'2014-11-20 00:00')
 
         # Make sure grading policy adjusted
-        policy = get_override_for_poc(poc, self.course, 'grading_policy',
+        policy = get_override_for_ccx(ccx, self.course, 'grading_policy',
                                       self.course.grading_policy)
         self.assertEqual(policy['GRADER'][0]['type'], 'Homework')
         self.assertEqual(policy['GRADER'][0]['min_count'], 4)
@@ -218,14 +219,14 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         """enroll a list of students who are members of the class
         """
         self.make_coach()
-        poc = self.make_poc()
+        ccx = self.make_ccx()
         enrollment = CourseEnrollmentFactory(course_id=self.course.id)
         student = enrollment.user
         outbox = self.get_outbox()
         self.assertEqual(len(outbox), 0)
 
         url = reverse(
-            'poc_invite',
+            'ccx_invite',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
         data = {
@@ -240,25 +241,25 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertTrue(302 in response.redirect_chain[0])
         self.assertEqual(len(outbox), 1)
         self.assertTrue(student.email in outbox[0].recipients())
-        # a PocMembership exists for this student
+        # a CcxMembership exists for this student
         self.assertTrue(
-            PocMembership.objects.filter(poc=poc, student=student).exists()
+            CcxMembership.objects.filter(ccx=ccx, student=student).exists()
         )
 
     def test_unenroll_member_student(self):
         """unenroll a list of students who are members of the class
         """
         self.make_coach()
-        poc = self.make_poc()
+        ccx = self.make_ccx()
         enrollment = CourseEnrollmentFactory(course_id=self.course.id)
         student = enrollment.user
         outbox = self.get_outbox()
         self.assertEqual(len(outbox), 0)
-        # student is member of POC:
-        PocMembershipFactory(poc=poc, student=student)
+        # student is member of CCX:
+        CcxMembershipFactory(ccx=ccx, student=student)
 
         url = reverse(
-            'poc_invite',
+            'ccx_invite',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
         data = {
@@ -275,7 +276,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertTrue(student.email in outbox[0].recipients())
         # the membership for this student is gone
         self.assertFalse(
-            PocMembership.objects.filter(poc=poc, student=student).exists()
+            CcxMembership.objects.filter(ccx=ccx, student=student).exists()
         )
 
     def test_enroll_non_user_student(self):
@@ -283,12 +284,12 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         """
         test_email = "nobody@nowhere.com"
         self.make_coach()
-        poc = self.make_poc()
+        ccx = self.make_ccx()
         outbox = self.get_outbox()
         self.assertEqual(len(outbox), 0)
 
         url = reverse(
-            'poc_invite',
+            'ccx_invite',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
         data = {
@@ -304,8 +305,8 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(len(outbox), 1)
         self.assertTrue(test_email in outbox[0].recipients())
         self.assertTrue(
-            PocFutureMembership.objects.filter(
-                poc=poc, email=test_email
+            CcxFutureMembership.objects.filter(
+                ccx=ccx, email=test_email
             ).exists()
         )
 
@@ -314,13 +315,13 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         """
         test_email = "nobody@nowhere.com"
         self.make_coach()
-        poc = self.make_poc()
+        ccx = self.make_ccx()
         outbox = self.get_outbox()
-        PocFutureMembershipFactory(poc=poc, email=test_email)
+        CcxFutureMembershipFactory(ccx=ccx, email=test_email)
         self.assertEqual(len(outbox), 0)
 
         url = reverse(
-            'poc_invite',
+            'ccx_invite',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
         data = {
@@ -336,8 +337,8 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(len(outbox), 1)
         self.assertTrue(test_email in outbox[0].recipients())
         self.assertFalse(
-            PocFutureMembership.objects.filter(
-                poc=poc, email=test_email
+            CcxFutureMembership.objects.filter(
+                ccx=ccx, email=test_email
             ).exists()
         )
 
@@ -345,7 +346,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         """enroll a single student who is a member of the class already
         """
         self.make_coach()
-        poc = self.make_poc()
+        ccx = self.make_ccx()
         enrollment = CourseEnrollmentFactory(course_id=self.course.id)
         student = enrollment.user
         # no emails have been sent so far
@@ -353,7 +354,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(len(outbox), 0)
 
         url = reverse(
-            'poc_manage_student',
+            'ccx_manage_student',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
         data = {
@@ -366,25 +367,25 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(len(response.redirect_chain), 1)
         self.assertTrue(302 in response.redirect_chain[0])
         self.assertEqual(len(outbox), 0)
-        # a PocMembership exists for this student
+        # a CcxMembership exists for this student
         self.assertTrue(
-            PocMembership.objects.filter(poc=poc, student=student).exists()
+            CcxMembership.objects.filter(ccx=ccx, student=student).exists()
         )
 
     def test_manage_remove_single_student(self):
         """unenroll a single student who is a member of the class already
         """
         self.make_coach()
-        poc = self.make_poc()
+        ccx = self.make_ccx()
         enrollment = CourseEnrollmentFactory(course_id=self.course.id)
         student = enrollment.user
-        PocMembershipFactory(poc=poc, student=student)
+        CcxMembershipFactory(ccx=ccx, student=student)
         # no emails have been sent so far
         outbox = self.get_outbox()
         self.assertEqual(len(outbox), 0)
 
         url = reverse(
-            'poc_manage_student',
+            'ccx_manage_student',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
         data = {
@@ -397,22 +398,23 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(len(response.redirect_chain), 1)
         self.assertTrue(302 in response.redirect_chain[0])
         self.assertEqual(len(outbox), 0)
-        # a PocMembership exists for this student
+        # a CcxMembership exists for this student
         self.assertFalse(
-            PocMembership.objects.filter(poc=poc, student=student).exists()
+            CcxMembership.objects.filter(ccx=ccx, student=student).exists()
         )
 
 
 @override_settings(FIELD_OVERRIDE_PROVIDERS=(
-    'pocs.overrides.PersonalOnlineCoursesOverrideProvider',))
-class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
+    'ccx.overrides.CustomCoursesForEdxOverrideProvider',))
+class TestCCXGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
-    Tests for Personal Online Courses views.
+    Tests for Custom Courses views.
     """
     def setUp(self):
         """
         Set up tests
         """
+        super(TestCCXGrades, self).setUp()
         self.course = course = CourseFactory.create()
 
         # Create instructor account
@@ -431,13 +433,13 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
                 metadata={'graded': True, 'format': 'Homework'})
             for _ in xrange(4)]
 
-        role = CoursePocCoachRole(self.course.id)
+        role = CourseCcxCoachRole(self.course.id)
         role.add_users(coach)
-        self.poc = poc = PocFactory(course_id=self.course.id, coach=self.coach)
+        self.ccx = ccx = CcxFactory(course_id=self.course.id, coach=self.coach)
 
         self.student = student = UserFactory.create()
         CourseEnrollmentFactory.create(user=student, course_id=self.course.id)
-        PocMembershipFactory(poc=poc, student=student, active=True)
+        CcxMembershipFactory(ccx=ccx, student=student, active=True)
 
         for i, section in enumerate(sections):
             for j in xrange(4):
@@ -466,12 +468,18 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
             block._field_data_cache = {}
             visible_children(block)
 
-        patch_context = patch('pocs.views.get_course_by_id')
+        # and after everything is done, clean up by un-doing the change to the
+        # OverrideFieldData object that is done during the wrap method.
+        def cleanup_provider_classes():
+            OverrideFieldData.provider_classes = None
+        self.addCleanup(cleanup_provider_classes)
+
+        patch_context = patch('ccx.views.get_course_by_id')
         get_course = patch_context.start()
         get_course.return_value = course
         self.addCleanup(patch_context.stop)
 
-        override_field_for_poc(poc, course, 'grading_policy', {
+        override_field_for_ccx(ccx, course, 'grading_policy', {
             'GRADER': [
                 {'drop_count': 0,
                  'min_count': 2,
@@ -481,13 +489,13 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
             ],
             'GRADE_CUTOFFS': {'Pass': 0.75},
         })
-        override_field_for_poc(
-            poc, sections[-1], 'visible_to_staff_only', True)
+        override_field_for_ccx(
+            ccx, sections[-1], 'visible_to_staff_only', True)
 
-    @patch('pocs.views.render_to_response', intercept_renderer)
+    @patch('ccx.views.render_to_response', intercept_renderer)
     def test_gradebook(self):
         url = reverse(
-            'poc_gradebook',
+            'ccx_gradebook',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
         response = self.client.get(url)
@@ -502,7 +510,7 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
 
     def test_grades_csv(self):
         url = reverse(
-            'poc_grades_csv',
+            'ccx_grades_csv',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
         )
         response = self.client.get(url)
@@ -527,9 +535,9 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
 
         self.client.login(username=self.student.username, password="test")
         session = self.client.session
-        session[ACTIVE_POC_KEY] = self.poc.id
+        session[ACTIVE_CCX_KEY] = self.ccx.id
         session.save()
-        self.client.session.get(ACTIVE_POC_KEY)
+        self.client.session.get(ACTIVE_CCX_KEY)
         url = reverse(
             'progress',
             kwargs={'course_id': self.course.id.to_deprecated_string()}
@@ -542,175 +550,176 @@ class TestPocGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(len(grades['section_breakdown']), 4)
 
 
-class TestSwitchActivePoc(ModuleStoreTestCase, LoginEnrollmentTestCase):
-    """Verify the view for switching which POC is active, if any
+class TestSwitchActiveCCX(ModuleStoreTestCase, LoginEnrollmentTestCase):
+    """Verify the view for switching which CCX is active, if any
     """
     def setUp(self):
+        super(TestSwitchActiveCCX, self).setUp()
         self.course = course = CourseFactory.create()
         coach = AdminFactory.create()
-        role = CoursePocCoachRole(course.id)
+        role = CourseCcxCoachRole(course.id)
         role.add_users(coach)
-        self.poc = PocFactory(course_id=course.id, coach=coach)
+        self.ccx = CcxFactory(course_id=course.id, coach=coach)
         enrollment = CourseEnrollmentFactory.create(course_id=course.id)
         self.user = enrollment.user
         self.target_url = reverse(
             'course_root', args=[course.id.to_deprecated_string()]
         )
 
-    def register_user_in_poc(self, active=False):
-        """create registration of self.user in self.poc
+    def register_user_in_ccx(self, active=False):
+        """create registration of self.user in self.ccx
 
         registration will be inactive unless active=True
         """
-        PocMembershipFactory(poc=self.poc, student=self.user, active=active)
+        CcxMembershipFactory(ccx=self.ccx, student=self.user, active=active)
 
-    def revoke_poc_registration(self):
-        from ..models import PocMembership
-        membership = PocMembership.objects.filter(
-            poc=self.poc, student=self.user
+    def revoke_ccx_registration(self):
+        from ..models import CcxMembership
+        membership = CcxMembership.objects.filter(
+            ccx=self.ccx, student=self.user
         )
         membership.delete()
 
-    def verify_active_poc(self, request, id=None):
+    def verify_active_ccx(self, request, id=None):
         if id:
             id = str(id)
-        self.assertEqual(id, request.session.get(ACTIVE_POC_KEY, None))
+        self.assertEqual(id, request.session.get(ACTIVE_CCX_KEY, None))
 
-    def test_unauthorized_cannot_switch_to_poc(self):
+    def test_unauthorized_cannot_switch_to_ccx(self):
         switch_url = reverse(
-            'switch_active_poc',
-            args=[self.course.id.to_deprecated_string(), self.poc.id]
+            'switch_active_ccx',
+            args=[self.course.id.to_deprecated_string(), self.ccx.id]
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
 
     def test_unauthorized_cannot_switch_to_mooc(self):
         switch_url = reverse(
-            'switch_active_poc',
+            'switch_active_ccx',
             args=[self.course.id.to_deprecated_string()]
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
 
-    def test_enrolled_inactive_user_cannot_select_poc(self):
-        self.register_user_in_poc(active=False)
+    def test_enrolled_inactive_user_cannot_select_ccx(self):
+        self.register_user_in_ccx(active=False)
         self.client.login(username=self.user.username, password="test")
         switch_url = reverse(
-            'switch_active_poc',
-            args=[self.course.id.to_deprecated_string(), self.poc.id]
+            'switch_active_ccx',
+            args=[self.course.id.to_deprecated_string(), self.ccx.id]
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
         self.assertTrue(response.get('Location', '').endswith(self.target_url))
-        # if the poc were active, we'd need to pass the ID of the poc here.
-        self.verify_active_poc(self.client)
+        # if the ccx were active, we'd need to pass the ID of the ccx here.
+        self.verify_active_ccx(self.client)
 
-    def test_enrolled_user_can_select_poc(self):
-        self.register_user_in_poc(active=True)
+    def test_enrolled_user_can_select_ccx(self):
+        self.register_user_in_ccx(active=True)
         self.client.login(username=self.user.username, password="test")
         switch_url = reverse(
-            'switch_active_poc',
-            args=[self.course.id.to_deprecated_string(), self.poc.id]
+            'switch_active_ccx',
+            args=[self.course.id.to_deprecated_string(), self.ccx.id]
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
         self.assertTrue(response.get('Location', '').endswith(self.target_url))
-        self.verify_active_poc(self.client, self.poc.id)
+        self.verify_active_ccx(self.client, self.ccx.id)
 
     def test_enrolled_user_can_select_mooc(self):
-        self.register_user_in_poc(active=True)
+        self.register_user_in_ccx(active=True)
         self.client.login(username=self.user.username, password="test")
-        # pre-seed the session with the poc id
+        # pre-seed the session with the ccx id
         session = self.client.session
-        session[ACTIVE_POC_KEY] = str(self.poc.id)
+        session[ACTIVE_CCX_KEY] = str(self.ccx.id)
         session.save()
         switch_url = reverse(
-            'switch_active_poc',
+            'switch_active_ccx',
             args=[self.course.id.to_deprecated_string()]
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
         self.assertTrue(response.get('Location', '').endswith(self.target_url))
-        self.verify_active_poc(self.client)
+        self.verify_active_ccx(self.client)
 
-    def test_unenrolled_user_cannot_select_poc(self):
+    def test_unenrolled_user_cannot_select_ccx(self):
         self.client.login(username=self.user.username, password="test")
         switch_url = reverse(
-            'switch_active_poc',
-            args=[self.course.id.to_deprecated_string(), self.poc.id]
+            'switch_active_ccx',
+            args=[self.course.id.to_deprecated_string(), self.ccx.id]
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
         self.assertTrue(response.get('Location', '').endswith(self.target_url))
-        # if the poc were active, we'd need to pass the ID of the poc here.
-        self.verify_active_poc(self.client)
+        # if the ccx were active, we'd need to pass the ID of the ccx here.
+        self.verify_active_ccx(self.client)
 
     def test_unenrolled_user_switched_to_mooc(self):
         self.client.login(username=self.user.username, password="test")
-        # pre-seed the session with the poc id
+        # pre-seed the session with the ccx id
         session = self.client.session
-        session[ACTIVE_POC_KEY] = str(self.poc.id)
+        session[ACTIVE_CCX_KEY] = str(self.ccx.id)
         session.save()
         switch_url = reverse(
-            'switch_active_poc',
-            args=[self.course.id.to_deprecated_string(), self.poc.id]
+            'switch_active_ccx',
+            args=[self.course.id.to_deprecated_string(), self.ccx.id]
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
         self.assertTrue(response.get('Location', '').endswith(self.target_url))
-        # we tried to select the poc but are not registered, so we are switched
+        # we tried to select the ccx but are not registered, so we are switched
         # back to the mooc view
-        self.verify_active_poc(self.client)
+        self.verify_active_ccx(self.client)
 
-    def test_unassociated_course_and_poc_not_selected(self):
+    def test_unassociated_course_and_ccx_not_selected(self):
         new_course = CourseFactory.create()
         self.client.login(username=self.user.username, password="test")
         expected_url = reverse(
             'course_root', args=[new_course.id.to_deprecated_string()]
         )
-        # the poc and the course are not related.
+        # the ccx and the course are not related.
         switch_url = reverse(
-            'switch_active_poc',
-            args=[new_course.id.to_deprecated_string(), self.poc.id]
+            'switch_active_ccx',
+            args=[new_course.id.to_deprecated_string(), self.ccx.id]
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
         self.assertTrue(response.get('Location', '').endswith(expected_url))
         # the mooc should be active
-        self.verify_active_poc(self.client)
+        self.verify_active_ccx(self.client)
 
-    def test_missing_poc_cannot_be_selected(self):
-        self.register_user_in_poc()
+    def test_missing_ccx_cannot_be_selected(self):
+        self.register_user_in_ccx()
         self.client.login(username=self.user.username, password="test")
         switch_url = reverse(
-            'switch_active_poc',
-            args=[self.course.id.to_deprecated_string(), self.poc.id]
+            'switch_active_ccx',
+            args=[self.course.id.to_deprecated_string(), self.ccx.id]
         )
-        # delete the poc
-        self.poc.delete()
+        # delete the ccx
+        self.ccx.delete()
 
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
         self.assertTrue(response.get('Location', '').endswith(self.target_url))
-        # we tried to select the poc it doesn't exist anymore, so we are
+        # we tried to select the ccx it doesn't exist anymore, so we are
         # switched back to the mooc view
-        self.verify_active_poc(self.client)
+        self.verify_active_ccx(self.client)
 
-    def test_revoking_poc_membership_revokes_active_poc(self):
-        self.register_user_in_poc(active=True)
+    def test_revoking_ccx_membership_revokes_active_ccx(self):
+        self.register_user_in_ccx(active=True)
         self.client.login(username=self.user.username, password="test")
-        # ensure poc is active in the request session
+        # ensure ccx is active in the request session
         switch_url = reverse(
-            'switch_active_poc',
-            args=[self.course.id.to_deprecated_string(), self.poc.id]
+            'switch_active_ccx',
+            args=[self.course.id.to_deprecated_string(), self.ccx.id]
         )
         self.client.get(switch_url)
-        self.verify_active_poc(self.client, self.poc.id)
-        # unenroll the user from the poc
-        self.revoke_poc_registration()
-        # request the course root and verify that the poc is not active
+        self.verify_active_ccx(self.client, self.ccx.id)
+        # unenroll the user from the ccx
+        self.revoke_ccx_registration()
+        # request the course root and verify that the ccx is not active
         self.client.get(self.target_url)
-        self.verify_active_poc(self.client)
+        self.verify_active_ccx(self.client)
 
 
 def flatten(seq):
diff --git a/lms/djangoapps/pocs/utils.py b/lms/djangoapps/ccx/utils.py
similarity index 66%
rename from lms/djangoapps/pocs/utils.py
rename to lms/djangoapps/ccx/utils.py
index 0678d4021c..a587bce4ea 100644
--- a/lms/djangoapps/pocs/utils.py
+++ b/lms/djangoapps/ccx/utils.py
@@ -1,9 +1,9 @@
 """
-POC Enrollment operations for use by Coach APIs.
+CCX Enrollment operations for use by Coach APIs.
 
 Does not include any access control, be sure to check access before calling.
 """
-
+import logging
 from courseware.courses import get_course_about_section
 from courseware.courses import get_course_by_id
 from django.contrib.auth.models import User
@@ -16,61 +16,64 @@ from xmodule.modulestore.django import modulestore
 from xmodule.error_module import ErrorDescriptor
 
 from .models import (
-    PocMembership,
-    PocFutureMembership,
+    CcxMembership,
+    CcxFutureMembership,
 )
-from .overrides import get_current_poc
+from .overrides import get_current_ccx
+
+
+log = logging.getLogger("edx.ccx")
 
 
 class EmailEnrollmentState(object):
     """ Store the complete enrollment state of an email in a class """
-    def __init__(self, poc, email):
+    def __init__(self, ccx, email):
         exists_user = User.objects.filter(email=email).exists()
         if exists_user:
             user = User.objects.get(email=email)
-            poc_member = PocMembership.objects.filter(poc=poc, student=user)
-            in_poc = poc_member.exists()
+            ccx_member = CcxMembership.objects.filter(ccx=ccx, student=user)
+            in_ccx = ccx_member.exists()
             full_name = user.profile.name
         else:
             user = None
-            in_poc = False
+            in_ccx = False
             full_name = None
         self.user = exists_user
         self.member = user
         self.full_name = full_name
-        self.in_poc = in_poc
+        self.in_ccx = in_ccx
 
     def __repr__(self):
-        return "{}(user={}, member={}, in_poc={}".format(
+        return "{}(user={}, member={}, in_ccx={}".format(
             self.__class__.__name__,
             self.user,
             self.member,
-            self.in_poc,
+            self.in_ccx,
         )
 
     def to_dict(self):
         return {
             'user': self.user,
             'member': self.member,
-            'in_poc': self.in_poc,
+            'in_ccx': self.in_ccx,
         }
 
 
-def enroll_email(poc, student_email, auto_enroll=False, email_students=False, email_params=None):
+def enroll_email(ccx, student_email, auto_enroll=False, email_students=False, email_params=None):
     if email_params is None:
-        email_params = get_email_params(poc, True)
-    previous_state = EmailEnrollmentState(poc, student_email)
+        email_params = get_email_params(ccx, True)
+    previous_state = EmailEnrollmentState(ccx, student_email)
 
     if previous_state.user:
-        if not previous_state.in_poc:
+        if not previous_state.in_ccx:
             user = User.objects.get(email=student_email)
-            membership = PocMembership(
-                poc=poc, student=user, active=True
+            membership = CcxMembership(
+                ccx=ccx, student=user, active=True
             )
             membership.save()
         elif auto_enroll:
             # activate existing memberships
-            membership = PocMembership.objects.get(student=user, poc=poc)
+            membership = CcxMembership.objects.get(student=user, ccx=ccx)
             membership.active = True
             membership.save()
         if email_students:
@@ -79,8 +82,8 @@ def enroll_email(poc, student_email, auto_enroll=False, email_students=False, em
             email_params['full_name'] = previous_state.full_name
             send_mail_to_student(student_email, email_params)
     else:
-        membership = PocFutureMembership(
-            poc=poc, auto_enroll=auto_enroll, email=student_email
+        membership = CcxFutureMembership(
+            ccx=ccx, auto_enroll=auto_enroll, email=student_email
         )
         membership.save()
         if email_students:
@@ -88,19 +91,19 @@ def enroll_email(poc, student_email, auto_enroll=False, email_students=False, em
             email_params['email_address'] = student_email
             send_mail_to_student(student_email, email_params)
 
-    after_state = EmailEnrollmentState(poc, student_email)
+    after_state = EmailEnrollmentState(ccx, student_email)
 
     return previous_state, after_state
 
 
-def unenroll_email(poc, student_email, email_students=False, email_params=None):
+def unenroll_email(ccx, student_email, email_students=False, email_params=None):
     if email_params is None:
-        email_params = get_email_params(poc, True)
-    previous_state = EmailEnrollmentState(poc, student_email)
+        email_params = get_email_params(ccx, True)
+    previous_state = EmailEnrollmentState(ccx, student_email)
 
-    if previous_state.in_poc:
-        PocMembership.objects.get(
-            poc=poc, student=previous_state.member
+    if previous_state.in_ccx:
+        CcxMembership.objects.get(
+            ccx=ccx, student=previous_state.member
         ).delete()
         if email_students:
             email_params['message'] = 'enrolled_unenroll'
@@ -108,25 +111,25 @@ def unenroll_email(poc, student_email, email_students=False, email_params=None):
             email_params['full_name'] = previous_state.full_name
             send_mail_to_student(student_email, email_params)
     else:
-        if PocFutureMembership.objects.filter(
-            poc=poc, email=student_email
+        if CcxFutureMembership.objects.filter(
+            ccx=ccx, email=student_email
         ).exists():
-            PocFutureMembership.objects.get(
-                poc=poc, email=student_email
+            CcxFutureMembership.objects.get(
+                ccx=ccx, email=student_email
             ).delete()
         if email_students:
             email_params['message'] = 'allowed_unenroll'
             email_params['email_address'] = student_email
             send_mail_to_student(student_email, email_params)
 
-    after_state = EmailEnrollmentState(poc, student_email)
+    after_state = EmailEnrollmentState(ccx, student_email)
 
     return previous_state, after_state
 
 
-def get_email_params(poc, auto_enroll, secure=True):
+def get_email_params(ccx, auto_enroll, secure=True):
     protocol = 'https' if secure else 'http'
-    course_id = poc.course_id
+    course_id = ccx.course_id
 
     stripped_site_name = microsite.get_value(
         'SITE_NAME',
@@ -135,7 +138,7 @@ def get_email_params(poc, auto_enroll, secure=True):
     registration_url = u'{proto}://{site}{path}'.format(
         proto=protocol,
         site=stripped_site_name,
-        path=reverse('student.views.register_user')
+        path=reverse('register_user')
     )
     course_url = u'{proto}://{site}{path}'.format(
         proto=protocol,
@@ -160,7 +163,7 @@ def get_email_params(poc, auto_enroll, secure=True):
     email_params = {
         'site_name': stripped_site_name,
         'registration_url': registration_url,
-        'course': poc,
+        'course': ccx,
         'auto_enroll': auto_enroll,
         'course_url': course_url,
         'course_about_url': course_about_url,
@@ -184,20 +187,20 @@ def send_mail_to_student(student, param_dict):
 
     email_template_dict = {
         'allowed_enroll': (
-            'pocs/enroll_email_allowedsubject.txt',
-            'pocs/enroll_email_allowedmessage.txt'
+            'ccx/enroll_email_allowedsubject.txt',
+            'ccx/enroll_email_allowedmessage.txt'
         ),
         'enrolled_enroll': (
-            'pocs/enroll_email_enrolledsubject.txt',
-            'pocs/enroll_email_enrolledmessage.txt'
+            'ccx/enroll_email_enrolledsubject.txt',
+            'ccx/enroll_email_enrolledmessage.txt'
         ),
         'allowed_unenroll': (
-            'pocs/unenroll_email_subject.txt',
-            'pocs/unenroll_email_allowedmessage.txt'
+            'ccx/unenroll_email_subject.txt',
+            'ccx/unenroll_email_allowedmessage.txt'
         ),
         'enrolled_unenroll': (
-            'pocs/unenroll_email_subject.txt',
-            'pocs/unenroll_email_enrolledmessage.txt'
+            'ccx/unenroll_email_subject.txt',
+            'ccx/unenroll_email_enrolledmessage.txt'
         ),
     }
 
@@ -226,54 +229,54 @@ def send_mail_to_student(student, param_dict):
         )
 
 
-def get_all_pocs_for_user(user):
-    """return all POCS to which the user is registered
+def get_all_ccx_for_user(user):
+    """return all CCXS to which the user is registered
 
     Returns a list of dicts: {
-        poc_name: <formatted title of POC course>
-        poc_url: <url to view this POC>
-        poc_active: True if this poc is currently the 'active' one
-        mooc_name: <formatted title of the MOOC course for this POC>
+        ccx_name: <formatted title of CCX course>
+        ccx_url: <url to view this CCX>
+        ccx_active: True if this ccx is currently the 'active' one
+        mooc_name: <formatted title of the MOOC course for this CCX>
         mooc_url: <url to view this MOOC>
     }
     """
     if user.is_anonymous():
         return []
-    current_active_poc = get_current_poc()
+    current_active_ccx = get_current_ccx()
     memberships = []
-    for membership in PocMembership.memberships_for_user(user):
-        course = get_course_by_id(membership.poc.course_id)
-        poc = membership.poc
-        poc_title = poc.display_name
+    for membership in CcxMembership.memberships_for_user(user):
+        course = get_course_by_id(membership.ccx.course_id)
+        ccx = membership.ccx
+        ccx_title = ccx.display_name
         mooc_title = get_course_about_section(course, 'title')
         url = reverse(
-            'switch_active_poc',
-            args=[course.id.to_deprecated_string(), membership.poc.id]
+            'switch_active_ccx',
+            args=[course.id.to_deprecated_string(), membership.ccx.id]
         )
         mooc_url = reverse(
-            'switch_active_poc',
-            args=[course.id.to_deprecated_string(),]
+            'switch_active_ccx',
+            args=[course.id.to_deprecated_string(), ]
         )
         memberships.append({
-            'poc_name': poc_title,
-            'poc_url': url,
-            'active': membership.poc == current_active_poc,
+            'ccx_name': ccx_title,
+            'ccx_url': url,
+            'active': membership.ccx == current_active_ccx,
             'mooc_name': mooc_title,
             'mooc_url': mooc_url,
         })
     return memberships
 
-def get_poc_membership_triplets(user, course_org_filter, org_filter_out_set):
+def get_ccx_membership_triplets(user, course_org_filter, org_filter_out_set):
     """
-    Get the relevant set of (PersonalOnlineCourse, PocMembership, Course)
+    Get the relevant set of (CustomCourseForEdX, CcxMembership, Course)
     triplets to be displayed on a student's dashboard.
     """
     # only active memberships for now
-    for membership in PocMembership.memberships_for_user(user):
-        poc = membership.poc
+    for membership in CcxMembership.memberships_for_user(user):
+        ccx = membership.ccx
         store = modulestore()
-        with store.bulk_operations(poc.course_id):
-            course = store.get_course(poc.course_id)
+        with store.bulk_operations(ccx.course_id):
+            course = store.get_course(ccx.course_id)
             if course and not isinstance(course, ErrorDescriptor):
                 # if we are in a Microsite, then filter out anything that is not
                 # attributed (by ORG) to that Microsite
@@ -284,8 +287,8 @@ def get_poc_membership_triplets(user, course_org_filter, org_filter_out_set):
                 elif course.location.org in org_filter_out_set:
                     continue
 
-                yield (poc, membership, course)
+                yield (ccx, membership, course)
             else:
                 log.error("User {0} enrolled in {2} course {1}".format(
-                    user.username, poc.course_id, "broken" if course else "non-existent"
+                    user.username, ccx.course_id, "broken" if course else "non-existent"
                 ))
diff --git a/lms/djangoapps/pocs/views.py b/lms/djangoapps/ccx/views.py
similarity index 71%
rename from lms/djangoapps/pocs/views.py
rename to lms/djangoapps/ccx/views.py
index 81d911f201..ddedf4fc3e 100644
--- a/lms/djangoapps/pocs/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -1,5 +1,5 @@
 """
-Views related to the Personal Online Courses feature.
+Views related to the Custom Courses feature.
 """
 import csv
 import datetime
@@ -33,24 +33,24 @@ from courseware.model_data import FieldDataCache
 from courseware.module_render import get_module_for_descriptor
 from edxmako.shortcuts import render_to_response
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
-from student.roles import CoursePocCoachRole
+from student.roles import CourseCcxCoachRole
 
 from instructor.offline_gradecalc import student_grades
 from instructor.views.api import _split_input_list
 from instructor.views.tools import get_student_from_identifier
 
-from .models import PersonalOnlineCourse, PocMembership
+from .models import CustomCourseForEdX, CcxMembership
 from .overrides import (
-    clear_override_for_poc,
-    get_override_for_poc,
-    override_field_for_poc,
-    poc_context,
+    clear_override_for_ccx,
+    get_override_for_ccx,
+    override_field_for_ccx,
+    ccx_context,
 )
 from .utils import (
     enroll_email,
     unenroll_email,
 )
-from pocs import ACTIVE_POC_KEY
+from ccx import ACTIVE_CCX_KEY
 
 
 log = logging.getLogger(__name__)
@@ -59,7 +59,7 @@ TODAY = datetime.datetime.today  # for patching in tests
 
 def coach_dashboard(view):
     """
-    View decorator which enforces that the user have the POC coach role on the
+    View decorator which enforces that the user have the CCX coach role on the
     given course and goes ahead and translates the course_id from the Django
     route into a course object.
     """
@@ -70,10 +70,10 @@ def coach_dashboard(view):
         and modifying the view's call signature.
         """
         course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-        role = CoursePocCoachRole(course_key)
+        role = CourseCcxCoachRole(course_key)
         if not role.has_user(request.user):
             return HttpResponseForbidden(
-                _('You must be a POC Coach to access this view.'))
+                _('You must be a CCX Coach to access this view.'))
         course = get_course_by_id(course_key, depth=None)
         return view(request, course)
     return wrapper
@@ -84,79 +84,79 @@ def coach_dashboard(view):
 @coach_dashboard
 def dashboard(request, course):
     """
-    Display the POC Coach Dashboard.
+    Display the CCX Coach Dashboard.
     """
-    poc = get_poc_for_coach(course, request.user)
+    ccx = get_ccx_for_coach(course, request.user)
     context = {
         'course': course,
-        'poc': poc,
+        'ccx': ccx,
     }
 
-    if poc:
-        schedule = get_poc_schedule(course, poc)
-        grading_policy = get_override_for_poc(
-            poc, course, 'grading_policy', course.grading_policy)
+    if ccx:
+        schedule = get_ccx_schedule(course, ccx)
+        grading_policy = get_override_for_ccx(
+            ccx, course, 'grading_policy', course.grading_policy)
         context['schedule'] = json.dumps(schedule, indent=4)
         context['save_url'] = reverse(
-            'save_poc', kwargs={'course_id': course.id})
-        context['poc_members'] = PocMembership.objects.filter(poc=poc)
+            'save_ccx', kwargs={'course_id': course.id})
+        context['ccx_members'] = CcxMembership.objects.filter(ccx=ccx)
         context['gradebook_url'] = reverse(
-            'poc_gradebook', kwargs={'course_id': course.id})
+            'ccx_gradebook', kwargs={'course_id': course.id})
         context['grades_csv_url'] = reverse(
-            'poc_grades_csv', kwargs={'course_id': course.id})
+            'ccx_grades_csv', kwargs={'course_id': course.id})
         context['grading_policy'] = json.dumps(grading_policy, indent=4)
         context['grading_policy_url'] = reverse(
-            'poc_set_grading_policy', kwargs={'course_id': course.id})
+            'ccx_set_grading_policy', kwargs={'course_id': course.id})
     else:
-        context['create_poc_url'] = reverse(
-            'create_poc', kwargs={'course_id': course.id})
-    return render_to_response('pocs/coach_dashboard.html', context)
+        context['create_ccx_url'] = reverse(
+            'create_ccx', kwargs={'course_id': course.id})
+    return render_to_response('ccx/coach_dashboard.html', context)
 
 
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
-def create_poc(request, course):
+def create_ccx(request, course):
     """
-    Create a new POC
+    Create a new CCX
     """
     name = request.POST.get('name')
-    poc = PersonalOnlineCourse(
+    ccx = CustomCourseForEdX(
         course_id=course.id,
         coach=request.user,
         display_name=name)
-    poc.save()
+    ccx.save()
 
     # Make sure start/due are overridden for entire course
     start = TODAY().replace(tzinfo=pytz.UTC)
-    override_field_for_poc(poc, course, 'start', start)
-    override_field_for_poc(poc, course, 'due', None)
+    override_field_for_ccx(ccx, course, 'start', start)
+    override_field_for_ccx(ccx, course, 'due', None)
 
     # Hide anything that can show up in the schedule
     hidden = 'visible_to_staff_only'
     for chapter in course.get_children():
-        override_field_for_poc(poc, chapter, hidden, True)
+        override_field_for_ccx(ccx, chapter, hidden, True)
         for sequential in chapter.get_children():
-            override_field_for_poc(poc, sequential, hidden, True)
+            override_field_for_ccx(ccx, sequential, hidden, True)
             for vertical in sequential.get_children():
-                override_field_for_poc(poc, vertical, hidden, True)
+                override_field_for_ccx(ccx, vertical, hidden, True)
 
-    url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
+    url = reverse('ccx_coach_dashboard', kwargs={'course_id': course.id})
     return redirect(url)
 
 
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
-def save_poc(request, course):
+def save_ccx(request, course):
     """
-    Save changes to POC.
+    Save changes to CCX.
     """
-    poc = get_poc_for_coach(course, request.user)
+    ccx = get_ccx_for_coach(course, request.user)
 
     def override_fields(parent, data, graded, earliest=None):
         """
-        Recursively apply POC schedule data to POC by overriding the
+        Recursively apply CCX schedule data to CCX by overriding the
         `visible_to_staff_only`, `start` and `due` fields for units in the
         course.
         """
@@ -165,20 +165,20 @@ def save_poc(request, course):
             for child in parent.get_children()}
         for unit in data:
             block = blocks[unit['location']]
-            override_field_for_poc(
-                poc, block, 'visible_to_staff_only', unit['hidden'])
+            override_field_for_ccx(
+                ccx, block, 'visible_to_staff_only', unit['hidden'])
             start = parse_date(unit['start'])
             if start:
                 if not earliest or start < earliest:
                     earliest = start
-                override_field_for_poc(poc, block, 'start', start)
+                override_field_for_ccx(ccx, block, 'start', start)
             else:
-                clear_override_for_poc(poc, block, 'start')
+                clear_override_for_ccx(ccx, block, 'start')
             due = parse_date(unit['due'])
             if due:
-                override_field_for_poc(poc, block, 'due', due)
+                override_field_for_ccx(ccx, block, 'due', due)
             else:
-                clear_override_for_poc(poc, block, 'due')
+                clear_override_for_ccx(ccx, block, 'due')
 
             if not unit['hidden'] and block.graded:
                graded[block.format] = graded.get(block.format, 0) + 1
@@ -191,12 +191,12 @@ def save_poc(request, course):
     graded = {}
     earliest = override_fields(course, json.loads(request.body), graded)
     if earliest:
-        override_field_for_poc(poc, course, 'start', earliest)
+        override_field_for_ccx(ccx, course, 'start', earliest)
 
     # Attempt to automatically adjust grading policy
     changed = False
-    policy = get_override_for_poc(
-        poc, course, 'grading_policy', course.grading_policy
+    policy = get_override_for_ccx(
+        ccx, course, 'grading_policy', course.grading_policy
     )
     policy = deepcopy(policy)
     grader = policy['GRADER']
@@ -206,11 +206,11 @@ def save_poc(request, course):
             changed = True
             section['min_count'] = count
     if changed:
-        override_field_for_poc(poc, course, 'grading_policy', policy)
+        override_field_for_ccx(ccx, course, 'grading_policy', policy)
 
     return HttpResponse(
         json.dumps({
-            'schedule': get_poc_schedule(course, poc),
+            'schedule': get_ccx_schedule(course, ccx),
             'grading_policy': json.dumps(policy, indent=4)}),
         content_type='application/json',
     )
@@ -221,13 +221,13 @@ def save_poc(request, course):
 @coach_dashboard
 def set_grading_policy(request, course):
     """
-    Set grading policy for the POC.
+    Set grading policy for the CCX.
     """
-    poc = get_poc_for_coach(course, request.user)
-    override_field_for_poc(
-        poc, course, 'grading_policy', json.loads(request.POST['policy']))
+    ccx = get_ccx_for_coach(course, request.user)
+    override_field_for_ccx(
+        ccx, course, 'grading_policy', json.loads(request.POST['policy']))
 
-    url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
+    url = reverse('ccx_coach_dashboard', kwargs={'course_id': course.id})
     return redirect(url)
 
 
@@ -263,36 +263,36 @@ def parse_date(datestring):
     return None
 
 
-def get_poc_for_coach(course, coach):
+def get_ccx_for_coach(course, coach):
     """
-    Looks to see if user is coach of a POC for this course.  Returns the POC or
+    Looks to see if user is coach of a CCX for this course.  Returns the CCX or
     None.
     """
     try:
-        return PersonalOnlineCourse.objects.get(
+        return CustomCourseForEdX.objects.get(
             course_id=course.id,
             coach=coach)
-    except PersonalOnlineCourse.DoesNotExist:
+    except CustomCourseForEdX.DoesNotExist:
         return None
 
 
-def get_poc_schedule(course, poc):
+def get_ccx_schedule(course, ccx):
     """
-    Generate a JSON serializable POC schedule.
+    Generate a JSON serializable CCX schedule.
     """
     def visit(node, depth=1):
         """
-        Recursive generator function which yields POC schedule nodes.
+        Recursive generator function which yields CCX schedule nodes.
         """
         for child in node.get_children():
-            start = get_override_for_poc(poc, child, 'start', None)
+            start = get_override_for_ccx(ccx, child, 'start', None)
             if start:
                 start = str(start)[:-9]
-            due = get_override_for_poc(poc, child, 'due', None)
+            due = get_override_for_ccx(ccx, child, 'due', None)
             if due:
                 due = str(due)[:-9]
-            hidden = get_override_for_poc(
-                poc, child, 'visible_to_staff_only',
+            hidden = get_override_for_ccx(
+                ccx, child, 'visible_to_staff_only',
                 child.visible_to_staff_only)
             visited = {
                 'location': str(child.location),
@@ -317,9 +317,9 @@ def get_poc_schedule(course, poc):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
-def poc_schedule(request, course):
-    poc = get_poc_for_coach(course, request.user)
-    schedule = get_poc_schedule(course, poc)
+def ccx_schedule(request, course):
+    ccx = get_ccx_for_coach(course, request.user)
+    schedule = get_ccx_schedule(course, ccx)
     json_schedule = json.dumps(schedule, indent=4)
     return HttpResponse(json_schedule, mimetype='application/json')
 
@@ -327,11 +327,11 @@ def poc_schedule(request, course):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
-def poc_invite(request, course):
+def ccx_invite(request, course):
     """
-    Invite users to new poc
+    Invite users to new ccx
     """
-    poc = get_poc_for_coach(course, request.user)
+    ccx = get_ccx_for_coach(course, request.user)
     action = request.POST.get('enrollment-button')
     identifiers_raw = request.POST.get('student-ids')
     identifiers = _split_input_list(identifiers_raw)
@@ -350,26 +350,26 @@ def poc_invite(request, course):
             validate_email(email)
             if action == 'Enroll':
                 enroll_email(
-                    poc,
+                    ccx,
                     email,
                     auto_enroll=auto_enroll,
                     email_students=email_students
                 )
             if action == "Unenroll":
-                unenroll_email(poc, email, email_students=email_students)
+                unenroll_email(ccx, email, email_students=email_students)
         except ValidationError:
             pass  # maybe log this?
-    url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
+    url = reverse('ccx_coach_dashboard', kwargs={'course_id': course.id})
     return redirect(url)
 
 
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
-def poc_student_management(request, course):
-    """Manage the enrollment of individual students in a POC
+def ccx_student_management(request, course):
+    """Manage the enrollment of individual students in a CCX
     """
-    poc = get_poc_for_coach(course, request.user)
+    ccx = get_ccx_for_coach(course, request.user)
     action = request.POST.get('student-action', None)
     student_id = request.POST.get('student-id', '')
     user = email = None
@@ -385,21 +385,21 @@ def poc_student_management(request, course):
         if action == 'add':
             # by decree, no emails sent to students added this way
             # by decree, any students added this way are auto_enrolled
-            enroll_email(poc, email, auto_enroll=True, email_students=False)
+            enroll_email(ccx, email, auto_enroll=True, email_students=False)
         elif action == 'revoke':
-            unenroll_email(poc, email, email_students=False)
+            unenroll_email(ccx, email, email_students=False)
     except ValidationError:
         pass  # XXX: log, report?
 
-    url = reverse('poc_coach_dashboard', kwargs={'course_id': course.id})
+    url = reverse('ccx_coach_dashboard', kwargs={'course_id': course.id})
     return redirect(url)
 
 
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
-def poc_gradebook(request, course):
+def ccx_gradebook(request, course):
     """
-    Show the gradebook for this POC.
+    Show the gradebook for this CCX.
     """
     # Need course module for overrides to function properly
     field_data_cache = FieldDataCache.cache_for_descriptor_descendents(
@@ -407,16 +407,16 @@ def poc_gradebook(request, course):
     course = get_module_for_descriptor(
         request.user, request, course, field_data_cache, course.id)
 
-    poc = get_poc_for_coach(course, request.user)
-    with poc_context(poc):
+    ccx = get_ccx_for_coach(course, request.user)
+    with ccx_context(ccx):
         # The grading policy for the MOOC is probably already cached.  We need
-        # to make sure we have the POC grading policy loaded.
+        # to make sure we have the CCX grading policy loaded.
         course._field_data_cache = {}  # pylint: disable=protected-access
         course.set_grading_policy(course.grading_policy)
 
         enrolled_students = User.objects.filter(
-            pocmembership__poc=poc,
-            pocmembership__active=1
+            ccxmembership__ccx=ccx,
+            ccxmembership__active=1
         ).order_by('username').select_related("profile")
 
         student_info = [
@@ -442,7 +442,7 @@ def poc_gradebook(request, course):
 
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
-def poc_grades_csv(request, course):
+def ccx_grades_csv(request, course):
     """
     Download grades as CSV.
     """
@@ -451,16 +451,16 @@ def poc_grades_csv(request, course):
         course.id, request.user, course, depth=2)
     course = get_module_for_descriptor(
         request.user, request, course, field_data_cache, course.id)
-    poc = get_poc_for_coach(course, request.user)
-    with poc_context(poc):
+    ccx = get_ccx_for_coach(course, request.user)
+    with ccx_context(ccx):
         # The grading policy for the MOOC is probably already cached.  We need
-        # to make sure we have the POC grading policy loaded.
+        # to make sure we have the CCX grading policy loaded.
         course._field_data_cache = {}  # pylint: disable=protected-access
         course.set_grading_policy(course.grading_policy)
 
         enrolled_students = User.objects.filter(
-            pocmembership__poc=poc,
-            pocmembership__active=1
+            ccxmembership__ccx=ccx,
+            ccxmembership__active=1
         ).order_by('username').select_related("profile")
         grades = iterate_grades_for(course, enrolled_students)
 
@@ -496,8 +496,8 @@ def poc_grades_csv(request, course):
 
 
 @login_required
-def swich_active_poc(request, course_id, poc_id=None):
-    """set the active POC for the logged-in user
+def switch_active_ccx(request, course_id, ccx_id=None):
+    """set the active CCX for the logged-in user
     """
     user = request.user
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
@@ -506,21 +506,21 @@ def swich_active_poc(request, course_id, poc_id=None):
     course_url = reverse(
         'course_root', args=[course.id.to_deprecated_string()]
     )
-    if poc_id is not None:
+    if ccx_id is not None:
         try:
-            requested_poc = PersonalOnlineCourse.objects.get(pk=poc_id)
-            assert requested_poc.course_id.to_deprecated_string() == course_id
-            if not PocMembership.objects.filter(
-                poc=requested_poc, student=request.user, active=True
+            requested_ccx = CustomCourseForEdX.objects.get(pk=ccx_id)
+            assert requested_ccx.course_id.to_deprecated_string() == course_id
+            if not CcxMembership.objects.filter(
+                ccx=requested_ccx, student=request.user, active=True
             ).exists():
-                poc_id = None
-        except PersonalOnlineCourse.DoesNotExist:
+                ccx_id = None
+        except CustomCourseForEdX.DoesNotExist:
             # what to do here?  Log the failure?  Do we care?
-            poc_id = None
+            ccx_id = None
         except AssertionError:
             # what to do here?  Log the failure?  Do we care?
-            poc_id = None
+            ccx_id = None
 
-    request.session[ACTIVE_POC_KEY] = poc_id
+    request.session[ACTIVE_CCX_KEY] = ccx_id
 
     return HttpResponseRedirect(course_url)
diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index 5256456c87..a17ff997ed 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -248,7 +248,7 @@ def _grade(student, request, course, keep_raw_scores):
 
         totaled_scores[section_format] = format_scores
 
-    # Grading policy might be overriden by a POC, need to reset it
+    # Grading policy might be overriden by a CCX, need to reset it
     course.set_grading_policy(course.grading_policy)
     grade_summary = course.grader.grade(totaled_scores, generate_random_scores=settings.GENERATE_PROFILE_SCORES)
 
diff --git a/lms/djangoapps/instructor/access.py b/lms/djangoapps/instructor/access.py
index d39fca0e1a..80678193fe 100644
--- a/lms/djangoapps/instructor/access.py
+++ b/lms/djangoapps/instructor/access.py
@@ -15,7 +15,7 @@ from django_comment_common.models import Role
 from student.roles import (
     CourseBetaTesterRole,
     CourseInstructorRole,
-    CoursePocCoachRole,
+    CourseCcxCoachRole,
     CourseStaffRole,
 )
 
@@ -26,7 +26,7 @@ ROLES = {
     'beta': CourseBetaTesterRole,
     'instructor': CourseInstructorRole,
     'staff': CourseStaffRole,
-    'poc_coach': CoursePocCoachRole,
+    'ccx_coach': CourseCcxCoachRole,
 }
 
 
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 29d0a5a1d7..1c43499bc7 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -679,7 +679,7 @@ def bulk_beta_modify_access(request, course_id):
 @common_exceptions_400
 @require_query_params(
     unique_student_identifier="email or username of user to change access",
-    rolename="'instructor', 'staff', 'beta', or 'poc_coach'",
+    rolename="'instructor', 'staff', 'beta', or 'ccx_coach'",
     action="'allow' or 'revoke'"
 )
 def modify_access(request, course_id):
@@ -691,7 +691,7 @@ def modify_access(request, course_id):
 
     Query parameters:
     unique_student_identifer is the target user's username or email
-    rolename is one of ['instructor', 'staff', 'beta', 'poc_coach']
+    rolename is one of ['instructor', 'staff', 'beta', 'ccx_coach']
     action is one of ['allow', 'revoke']
     """
     course_id = SlashSeparatedCourseKey.from_deprecated_string(course_id)
@@ -762,7 +762,7 @@ def list_course_role_members(request, course_id):
     List instructors and staff.
     Requires instructor access.
 
-    rolename is one of ['instructor', 'staff', 'beta', 'poc_coach']
+    rolename is one of ['instructor', 'staff', 'beta', 'ccx_coach']
 
     Returns JSON of the form {
         "course_id": "some/course/id",
diff --git a/lms/djangoapps/pocs/__init__.py b/lms/djangoapps/pocs/__init__.py
deleted file mode 100644
index 4da31a2dd5..0000000000
--- a/lms/djangoapps/pocs/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-ACTIVE_POC_KEY = '_poc_id'
diff --git a/lms/djangoapps/pocs/migrations/0002_auto__add_pocfuturemembership__add_field_pocmembership_active.py b/lms/djangoapps/pocs/migrations/0002_auto__add_pocfuturemembership__add_field_pocmembership_active.py
deleted file mode 100644
index 9e650b7526..0000000000
--- a/lms/djangoapps/pocs/migrations/0002_auto__add_pocfuturemembership__add_field_pocmembership_active.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'PocFutureMembership'
-        db.create_table('pocs_pocfuturemembership', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('poc', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['pocs.PersonalOnlineCourse'])),
-            ('email', self.gf('django.db.models.fields.CharField')(max_length=255)),
-        ))
-        db.send_create_signal('pocs', ['PocFutureMembership'])
-
-        # Adding field 'PocMembership.active'
-        db.add_column('pocs_pocmembership', 'active',
-                      self.gf('django.db.models.fields.BooleanField')(default=False),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting model 'PocFutureMembership'
-        db.delete_table('pocs_pocfuturemembership')
-
-        # Deleting field 'PocMembership.active'
-        db.delete_column('pocs_pocmembership', 'active')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'pocs.personalonlinecourse': {
-            'Meta': {'object_name': 'PersonalOnlineCourse'},
-            'coach': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
-            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
-            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'pocs.pocfieldoverride': {
-            'Meta': {'unique_together': "(('poc', 'location', 'field'),)", 'object_name': 'PocFieldOverride'},
-            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
-            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
-            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
-        },
-        'pocs.pocfuturemembership': {
-            'Meta': {'object_name': 'PocFutureMembership'},
-            'email': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"})
-        },
-        'pocs.pocmembership': {
-            'Meta': {'object_name': 'PocMembership'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
-            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['pocs']
\ No newline at end of file
diff --git a/lms/djangoapps/pocs/migrations/0003_add_poc_membership_future_auto_enroll_flag.py b/lms/djangoapps/pocs/migrations/0003_add_poc_membership_future_auto_enroll_flag.py
deleted file mode 100644
index 27e844371d..0000000000
--- a/lms/djangoapps/pocs/migrations/0003_add_poc_membership_future_auto_enroll_flag.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'PocFutureMembership.auto_enroll'
-        db.add_column('pocs_pocfuturemembership', 'auto_enroll',
-                      self.gf('django.db.models.fields.BooleanField')(default=False),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'PocFutureMembership.auto_enroll'
-        db.delete_column('pocs_pocfuturemembership', 'auto_enroll')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'pocs.personalonlinecourse': {
-            'Meta': {'object_name': 'PersonalOnlineCourse'},
-            'coach': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
-            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
-            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'pocs.pocfieldoverride': {
-            'Meta': {'unique_together': "(('poc', 'location', 'field'),)", 'object_name': 'PocFieldOverride'},
-            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
-            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
-            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
-        },
-        'pocs.pocfuturemembership': {
-            'Meta': {'object_name': 'PocFutureMembership'},
-            'auto_enroll': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'email': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"})
-        },
-        'pocs.pocmembership': {
-            'Meta': {'object_name': 'PocMembership'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'poc': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pocs.PersonalOnlineCourse']"}),
-            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['pocs']
\ No newline at end of file
diff --git a/lms/djangoapps/pocs/overrides.py b/lms/djangoapps/pocs/overrides.py
deleted file mode 100644
index c7fa1ab2bf..0000000000
--- a/lms/djangoapps/pocs/overrides.py
+++ /dev/null
@@ -1,159 +0,0 @@
-"""
-API related to providing field overrides for individual students.  This is used
-by the individual due dates feature.
-"""
-import json
-import threading
-
-from contextlib import contextmanager
-
-from courseware.field_overrides import FieldOverrideProvider
-from pocs import ACTIVE_POC_KEY
-
-from .models import PocMembership, PocFieldOverride
-
-
-class PersonalOnlineCoursesOverrideProvider(FieldOverrideProvider):
-    """
-    A concrete implementation of
-    :class:`~courseware.field_overrides.FieldOverrideProvider` which allows for
-    overrides to be made on a per user basis.
-    """
-    def get(self, block, name, default):
-        poc = get_current_poc()
-        if poc:
-            return get_override_for_poc(poc, block, name, default)
-        return default
-
-
-class _PocContext(threading.local):
-    """
-    A threading local used to implement the `with_poc` context manager, that
-    keeps track of the POC currently set as the context.
-    """
-    poc = None
-
-
-_POC_CONTEXT = _PocContext()
-
-
-@contextmanager
-def poc_context(poc):
-    """
-    A context manager which can be used to explicitly set the POC that is in
-    play for field overrides.  This mechanism overrides the standard mechanism
-    of looking in the user's session to see if they are enrolled in a POC and
-    viewing that POC.
-    """
-    prev = _POC_CONTEXT.poc
-    _POC_CONTEXT.poc = poc
-    yield
-    _POC_CONTEXT.poc = prev
-
-
-def get_current_poc():
-    """
-    Return the poc that is active for this request.
-    """
-    poc = _POC_CONTEXT.poc
-    if poc:
-        return poc
-
-
-def get_override_for_poc(poc, block, name, default=None):
-    """
-    Gets the value of the overridden field for the `poc`.  `block` and `name`
-    specify the block and the name of the field.  If the field is not
-    overridden for the given poc, returns `default`.
-    """
-    if not hasattr(block, '_poc_overrides'):
-        block._poc_overrides = {}
-    overrides = block._poc_overrides.get(poc.id)
-    if overrides is None:
-        overrides = _get_overrides_for_poc(poc, block)
-        block._poc_overrides[poc.id] = overrides
-    return overrides.get(name, default)
-
-
-def _get_overrides_for_poc(poc, block):
-    """
-    Returns a dictionary mapping field name to overriden value for any
-    overrides set on this block for this POC.
-    """
-    overrides = {}
-    query = PocFieldOverride.objects.filter(
-        poc=poc,
-        location=block.location
-    )
-    for override in query:
-        field = block.fields[override.field]
-        value = field.from_json(json.loads(override.value))
-        overrides[override.field] = value
-    return overrides
-
-
-def override_field_for_poc(poc, block, name, value):
-    """
-    Overrides a field for the `poc`.  `block` and `name` specify the block
-    and the name of the field on that block to override.  `value` is the
-    value to set for the given field.
-    """
-    override, created = PocFieldOverride.objects.get_or_create(
-        poc=poc,
-        location=block.location,
-        field=name)
-    field = block.fields[name]
-    override.value = json.dumps(field.to_json(value))
-    override.save()
-
-    if hasattr(block, '_poc_overrides'):
-        del block._poc_overrides[poc.id]
-
-
-def clear_override_for_poc(poc, block, name):
-    """
-    Clears a previously set field override for the `poc`.  `block` and `name`
-    specify the block and the name of the field on that block to clear.
-    This function is idempotent--if no override is set, nothing action is
-    performed.
-    """
-    try:
-        PocFieldOverride.objects.get(
-            poc=poc,
-            location=block.location,
-            field=name).delete()
-
-        if hasattr(block, '_poc_overrides'):
-            del block._poc_overrides[poc.id]
-
-    except PocFieldOverride.DoesNotExist:
-        pass
-
-
-class PocMiddleware(object):
-    """
-    Checks to see if current session is examining a POC and sets the POC as
-    the current POC for the override machinery if so.
-    """
-    def process_request(self, request):
-        """
-        Do the check.
-        """
-        poc_id = request.session.get(ACTIVE_POC_KEY, None)
-        if poc_id is not None:
-            try:
-                membership = PocMembership.objects.get(
-                    student=request.user, active=True, poc__id__exact=poc_id
-                )
-                _POC_CONTEXT.poc = membership.poc
-            except PocMembership.DoesNotExist:
-                # if there is no membership, be sure to unset the active poc
-                _POC_CONTEXT.poc = None
-                request.session.pop(ACTIVE_POC_KEY)
-
-    def process_response(self, request, response):
-        """
-        Clean up afterwards.
-        """
-        _POC_CONTEXT.poc = None
-        return response
diff --git a/lms/djangoapps/pocs/tests/factories.py b/lms/djangoapps/pocs/tests/factories.py
deleted file mode 100644
index 7cd54f8501..0000000000
--- a/lms/djangoapps/pocs/tests/factories.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from factory.django import DjangoModelFactory
-from pocs.models import PersonalOnlineCourse
-from pocs.models import PocMembership
-from pocs.models import PocFutureMembership
-
-
-class PocFactory(DjangoModelFactory):
-    FACTORY_FOR = PersonalOnlineCourse
-    display_name = "Test POC"
-
-
-class PocMembershipFactory(DjangoModelFactory):
-    FACTORY_FOR = PocMembership
-    active = False
-
-
-class PocFutureMembershipFactory(DjangoModelFactory):
-    FACTORY_FOR = PocFutureMembership
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 76d9c77f93..69ae6cf9d8 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -577,12 +577,12 @@ ECOMMERCE_API_URL = ENV_TOKENS.get('ECOMMERCE_API_URL', ECOMMERCE_API_URL)
 ECOMMERCE_API_SIGNING_KEY = AUTH_TOKENS.get('ECOMMERCE_API_SIGNING_KEY', ECOMMERCE_API_SIGNING_KEY)
 ECOMMERCE_API_TIMEOUT = ENV_TOKENS.get('ECOMMERCE_API_TIMEOUT', ECOMMERCE_API_TIMEOUT)
 
-##### Personal Online Courses #####
-if FEATURES.get('PERSONAL_ONLINE_COURSES'):
-    INSTALLED_APPS += ('pocs',)
-    MIDDLEWARE_CLASSES += ('pocs.overrides.PocMiddleware',)
+##### Custom Courses for EdX #####
+if FEATURES.get('CUSTOM_COURSES_EDX'):
+    INSTALLED_APPS += ('ccx',)
+    MIDDLEWARE_CLASSES += ('ccx.overrides.CcxMiddleware',)
     FIELD_OVERRIDE_PROVIDERS += (
-        'pocs.overrides.PersonalOnlineCoursesOverrideProvider',
+        'ccx.overrides.CustomCoursesForEdxOverrideProvider',
     )
 
 ##### Individual Due Date Extensions #####
diff --git a/lms/envs/common.py b/lms/envs/common.py
index edd74796b5..41ddae0124 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -214,8 +214,8 @@ FEATURES = {
     # True.
     'INDIVIDUAL_DUE_DATES': False,
 
-    # Enable Personal Online Courses
-    'PERSONAL_ONLINE_COURSES': False,
+    # Enable Custom Courses for EdX
+    'CUSTOM_COURSES_EDX': False,
 
     # Enable legacy instructor dashboard
     'ENABLE_INSTRUCTOR_LEGACY_DASHBOARD': True,
@@ -1203,7 +1203,8 @@ reverify_js = [
     'js/verify_student/incourse_reverify.js',
 ]
 
-pocs_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'js/pocs/**/*.js'))
+ccx_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'js/ccx/**/*.js'))
+
 
 PIPELINE_CSS = {
     'style-vendor': {
@@ -1399,9 +1400,9 @@ PIPELINE_JS = {
         'source_filenames': reverify_js,
         'output_filename': 'js/reverify.js'
     },
-    'pocs': {
-        'source_filenames': pocs_js,
-        'output_filename': 'js/pocs.js'
+    'ccx': {
+        'source_filenames': ccx_js,
+        'output_filename': 'js/ccx.js'
     }
 }
 
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 6a2e26109a..fea9c54e48 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -469,6 +469,6 @@ FACEBOOK_API_VERSION = "v2.2"
 # Certificates Views
 FEATURES['CERTIFICATES_HTML_VIEW'] = True
 
-######### personal online courses #########
-INSTALLED_APPS += ('pocs',)
-MIDDLEWARE_CLASSES += ('pocs.overrides.PocMiddleware',)
+######### custom courses #########
+INSTALLED_APPS += ('ccx',)
+MIDDLEWARE_CLASSES += ('ccx.overrides.CcxMiddleware',)
diff --git a/lms/static/js/pocs/schedule.js b/lms/static/js/ccx/schedule.js
similarity index 92%
rename from lms/static/js/pocs/schedule.js
rename to lms/static/js/ccx/schedule.js
index ee234053aa..328019c02a 100644
--- a/lms/static/js/pocs/schedule.js
+++ b/lms/static/js/ccx/schedule.js
@@ -3,18 +3,18 @@ var edx = edx || {};
 (function($, _, Backbone, gettext) {
     'use strict';
 
-    edx.pocs = edx.pocs || {};
-    edx.pocs.schedule = edx.pocs.schedule || {};
+    edx.ccx = edx.ccx || {};
+    edx.ccx.schedule = edx.ccx.schedule || {};
 
     var syncErrorMessage = gettext("The data could not be saved.");
 
     var self;
 
-    edx.pocs.schedule.reloadPage = function() {
+    edx.ccx.schedule.reloadPage = function() {
         location.reload();
     };
 
-    edx.pocs.schedule.UnitModel = Backbone.Model.extend({
+    edx.ccx.schedule.UnitModel = Backbone.Model.extend({
         defaults: {
             location: '',
             display_name: '',
@@ -27,18 +27,18 @@ var edx = edx || {};
 
     });
 
-    edx.pocs.schedule.Schedule = Backbone.Collection.extend({
+    edx.ccx.schedule.Schedule = Backbone.Collection.extend({
 
-        model: edx.pocs.schedule.UnitModel,
-        url: 'poc_schedule'
+        model: edx.ccx.schedule.UnitModel,
+        url: 'ccx_schedule'
 
     });
 
-    edx.pocs.schedule.ScheduleView = Backbone.View.extend({
+    edx.ccx.schedule.ScheduleView = Backbone.View.extend({
 
         initialize: function() {
             _.bindAll(this, 'render');
-	    this.schedule_collection = new edx.pocs.schedule.Schedule();
+	    this.schedule_collection = new edx.ccx.schedule.Schedule();
 	    this.schedule = {};
 	    this.schedule_collection.bind('reset', this.render);
 	    this.schedule_collection.fetch({reset: true});
@@ -63,23 +63,23 @@ var edx = edx || {};
             this.showing = this.pruned(self.schedule, function(node) {
               return !node.hidden});
             this.$el.html(schedule_template({chapters: this.showing}));
-            $('table.poc-schedule .sequential,.vertical').hide();
-            $('table.poc-schedule .toggle-collapse').on('click', this.toggle_collapse);
+            $('table.ccx-schedule .sequential,.vertical').hide();
+            $('table.ccx-schedule .toggle-collapse').on('click', this.toggle_collapse);
 	    //
 	    // Hidden hover fields for empty date fields
-	    $('table.poc-schedule .date a').each(function() {
+	    $('table.ccx-schedule .date a').each(function() {
 	      if (! $(this).text()) {
 		$(this).text('Set date').addClass('empty');
 	      }
 	    });
 	    
 	    // Handle date edit clicks
-	    $('table.poc-schedule .date a').attr('href', '#enter-date-modal')
+	    $('table.ccx-schedule .date a').attr('href', '#enter-date-modal')
 	      .leanModal({closeButton: '.close-modal'});
-	    $('table.poc-schedule .due-date a').on('click', this.enterNewDate('due'));
-	    $('table.poc-schedule .start-date a').on('click', this.enterNewDate('start'));
+	    $('table.ccx-schedule .due-date a').on('click', this.enterNewDate('due'));
+	    $('table.ccx-schedule .start-date a').on('click', this.enterNewDate('start'));
 	    // Click handler for remove all
-	    $('table.poc-schedule a#remove-all').on('click', function(event) {
+	    $('table.ccx-schedule a#remove-all').on('click', function(event) {
 	      event.preventDefault();
 	      self.schedule_apply(self.schedule, self.hide);
 	      self.dirty = true;
@@ -175,7 +175,7 @@ var edx = edx || {};
 	    });
 
 	    // Remove unit handler
-	    $('table.poc-schedule a.remove-unit').on('click', function(event) {
+	    $('table.ccx-schedule a.remove-unit').on('click', function(event) {
 	      var row = $(this).closest('tr'),
 		  path = row.data('location').split(' '),
 		  unit = self.find_unit(self.schedule, path[0], path[1], path[2]);
diff --git a/lms/static/sass/course.scss.mako b/lms/static/sass/course.scss.mako
index d401e5786f..b3b8ebb2bb 100644
--- a/lms/static/sass/course.scss.mako
+++ b/lms/static/sass/course.scss.mako
@@ -77,8 +77,8 @@
 @import "course/instructor/email";
 @import "xmodule/descriptors/css/module-styles.scss";
 
-// course - poc_coach
-@import "course/poc_coach/dashboard";
+// course - ccx_coach
+@import "course/ccx_coach/dashboard";
 
 // discussion
 @import "course/discussion/form-wmd-toolbar";
diff --git a/lms/static/sass/course/poc_coach/_dashboard.scss b/lms/static/sass/course/ccx_coach/_dashboard.scss
similarity index 87%
rename from lms/static/sass/course/poc_coach/_dashboard.scss
rename to lms/static/sass/course/ccx_coach/_dashboard.scss
index e6bebb5e7a..0d96f64e33 100644
--- a/lms/static/sass/course/poc_coach/_dashboard.scss
+++ b/lms/static/sass/course/ccx_coach/_dashboard.scss
@@ -1,9 +1,9 @@
-.poc-schedule-container {
+.ccx-schedule-container {
     float: left;
     width: 750px;
 }
 
-table.poc-schedule {
+table.ccx-schedule {
     width: 100%;
 
     thead {
@@ -34,19 +34,19 @@ table.poc-schedule {
     }
 }
 
-.poc-schedule-sidebar {
+.ccx-schedule-sidebar {
     float: left;
     width: 295px;
     margin-left: 20px;
 }
 
-.poc-sidebar-panel {
+.ccx-sidebar-panel {
     border: 1px solid #cbcbcb;
     padding: 15px;
     margin-bottom: 20px;
 }
 
-form.poc-form {
+form.ccx-form {
     line-height: 1.5;
     select {
         width: 100%;
diff --git a/lms/templates/pocs/_dashboard_poc_listing.html b/lms/templates/ccx/_dashboard_ccx_listing.html
similarity index 54%
rename from lms/templates/pocs/_dashboard_poc_listing.html
rename to lms/templates/ccx/_dashboard_ccx_listing.html
index 8d032d1274..8285a37ec0 100644
--- a/lms/templates/pocs/_dashboard_poc_listing.html
+++ b/lms/templates/ccx/_dashboard_ccx_listing.html
@@ -1,4 +1,4 @@
-<%page args="poc, membership, course" />
+<%page args="ccx, membership, course" />
 
 <%! from django.utils.translation import ugettext as _ %>
 <%!
@@ -6,24 +6,24 @@
   from courseware.courses import course_image_url, get_course_about_section
 %>
 <%
-  poc_switch_target = reverse('switch_active_poc', args=[course.id.to_deprecated_string(), poc.id])
+  ccx_switch_target = reverse('switch_active_ccx', args=[course.id.to_deprecated_string(), ccx.id])
 %>
 <li class="course-item">
   <article class="course">
-    <a href="${poc_switch_target}" class="cover">
-      <img src="${course_image_url(course)}" alt="${_('{course_number} {poc_name} Cover Image').format(course_number=course.number, poc_name=poc.display_name) |h}" />
+    <a href="${ccx_switch_target}" class="cover">
+      <img src="${course_image_url(course)}" alt="${_('{course_number} {ccx_name} Cover Image').format(course_number=course.number, ccx_name=ccx.display_name) |h}" />
     </a>
     <section class="info">
       <hgroup>
         <p class="date-block">
-        Personal Online Course
+        Custom Course
         </p>
         <h2 class="university">${get_course_about_section(course, 'university')}</h2>
         <h3>
-          <a href="${poc_switch_target}">${course.display_number_with_default | h} ${poc.display_name}</a>
+          <a href="${ccx_switch_target}">${course.display_number_with_default | h} ${ccx.display_name}</a>
         </h3>
       </hgroup>
-      <a href="${poc_switch_target}" class="enter-course">${_('View Course')}</a>
+      <a href="${ccx_switch_target}" class="enter-course">${_('View Course')}</a>
     </section>
   </article>
 </li>
diff --git a/lms/templates/pocs/coach_dashboard.html b/lms/templates/ccx/coach_dashboard.html
similarity index 89%
rename from lms/templates/pocs/coach_dashboard.html
rename to lms/templates/ccx/coach_dashboard.html
index 136c73bed4..6dbdc6edfa 100644
--- a/lms/templates/pocs/coach_dashboard.html
+++ b/lms/templates/ccx/coach_dashboard.html
@@ -4,8 +4,8 @@
 <%inherit file="/main.html" />
 <%namespace name='static' file='/static_content.html'/>
 
-<%block name="pagetitle">${_("POC Coach Dashboard")}</%block>
-<%block name="nav_skip">#poc-coach-dashboard-content</%block>
+<%block name="pagetitle">${_("CCX Coach Dashboard")}</%block>
+<%block name="nav_skip">#ccx-coach-dashboard-content</%block>
 
 <%block name="headextra">
   <%static:css group='style-course-vendor'/>
@@ -14,24 +14,24 @@
   <%static:css group='style-course'/>
 </%block>
 
-<%include file="/courseware/course_navigation.html" args="active_page='poc_coach'" />
+<%include file="/courseware/course_navigation.html" args="active_page='ccx_coach'" />
 
 <section class="container">
   <div class="instructor-dashboard-wrapper-2">
-    <section class="instructor-dashboard-content-2" id="poc-coach-dashboard-content">
-      <h1>${_("POC Coach Dashboard")}</h1>
+    <section class="instructor-dashboard-content-2" id="ccx-coach-dashboard-content">
+      <h1>${_("CCX Coach Dashboard")}</h1>
 
-      %if not poc:
+      %if not ccx:
       <section>
-        <form action="${create_poc_url}" method="POST">
+        <form action="${create_ccx_url}" method="POST">
           <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
-          <input name="name" placeholder="Name your POC"/><br/>
-          <button id="create-poc">Coach a new Personal Online Course</button>
+          <input name="name" placeholder="Name your CCX"/><br/>
+          <button id="create-ccx">Coach a new Custom Course for EdX</button>
         </form>
       </section>
       %endif
       
-      %if poc:
+      %if ccx:
       <ul class="instructor-nav">
         <li class="nav-item">
           <a href="#" data-section="membership">${_("Enrollment")}</a>
diff --git a/lms/templates/pocs/enroll_email_allowedmessage.txt b/lms/templates/ccx/enroll_email_allowedmessage.txt
similarity index 100%
rename from lms/templates/pocs/enroll_email_allowedmessage.txt
rename to lms/templates/ccx/enroll_email_allowedmessage.txt
diff --git a/lms/templates/pocs/enroll_email_allowedsubject.txt b/lms/templates/ccx/enroll_email_allowedsubject.txt
similarity index 100%
rename from lms/templates/pocs/enroll_email_allowedsubject.txt
rename to lms/templates/ccx/enroll_email_allowedsubject.txt
diff --git a/lms/templates/pocs/enroll_email_enrolledmessage.txt b/lms/templates/ccx/enroll_email_enrolledmessage.txt
similarity index 100%
rename from lms/templates/pocs/enroll_email_enrolledmessage.txt
rename to lms/templates/ccx/enroll_email_enrolledmessage.txt
diff --git a/lms/templates/pocs/enroll_email_enrolledsubject.txt b/lms/templates/ccx/enroll_email_enrolledsubject.txt
similarity index 100%
rename from lms/templates/pocs/enroll_email_enrolledsubject.txt
rename to lms/templates/ccx/enroll_email_enrolledsubject.txt
diff --git a/lms/templates/pocs/enrollment.html b/lms/templates/ccx/enrollment.html
similarity index 96%
rename from lms/templates/pocs/enrollment.html
rename to lms/templates/ccx/enrollment.html
index 15d8942a6a..f2b7b8544d 100644
--- a/lms/templates/pocs/enrollment.html
+++ b/lms/templates/ccx/enrollment.html
@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 
 <div class="batch-enrollment" style="float:left;width:50%">
-  <form method="POST" action="poc_invite">
+  <form method="POST" action="ccx_invite">
   <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
   <h2> ${_("Batch Enrollment")} </h2>
   <p>
@@ -46,7 +46,7 @@
 </div>
 
 <div class="member-lists-management" style="float:left;width:50%">
-  <form method="POST" action="poc_manage_student">
+  <form method="POST" action="ccx_manage_student">
   <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
   <div class="auth-list-container active">
     <div class="member-list-widget">
@@ -61,7 +61,7 @@
             </tr>
           </thead>
           <tbody>
-            %for member in poc_members:
+            %for member in ccx_members:
             <tr>
               <td>${member.student}</td>
               <td>${member.student.email}</td>
diff --git a/lms/templates/pocs/grading_policy.html b/lms/templates/ccx/grading_policy.html
similarity index 100%
rename from lms/templates/pocs/grading_policy.html
rename to lms/templates/ccx/grading_policy.html
diff --git a/lms/templates/pocs/schedule.html b/lms/templates/ccx/schedule.html
similarity index 83%
rename from lms/templates/pocs/schedule.html
rename to lms/templates/ccx/schedule.html
index 18e8f5c652..b9f6f6e6a5 100644
--- a/lms/templates/pocs/schedule.html
+++ b/lms/templates/ccx/schedule.html
@@ -15,18 +15,18 @@
     .ui-datepicker { z-index: 100000 !important; }
     input.date, input.time { width: auto !important; display: inline !important; }
   </style>
-  <%static:js group='pocs'/>
+  <%static:js group='ccx'/>
 </%block>
 
 %for template_name in ["schedule"]:
-  <script type="text/template" id="poc-${template_name}-template">
-    <%static:include path="pocs/${template_name}.underscore" />
+  <script type="text/template" id="ccx-${template_name}-template">
+    <%static:include path="ccx/${template_name}.underscore" />
   </script>
 %endfor
 
-<div class="poc-schedule-container">
-  <div id="poc-schedule"></div>
-  <div id="new-poc-schedule"></div>
+<div class="ccx-schedule-container">
+  <div id="ccx-schedule"></div>
+  <div id="new-ccx-schedule"></div>
 </div>
 
 <section id="enter-date-modal" class="modal" aria-hidden="true">
@@ -53,8 +53,8 @@
   </div>
 </section>
 
-<div class="poc-schedule-sidebar">
-  <div class="poc-sidebar-panel" id="dirty-schedule">
+<div class="ccx-schedule-sidebar">
+  <div class="ccx-sidebar-panel" id="dirty-schedule">
     <h2>${_('Save changes')}</h2>
     <form role="form">
       <p>${_("You have unsaved changes.")}</p>
@@ -64,13 +64,13 @@
       </div>
     </form>
   </div>
-  <div class="poc-sidebar-panel" id="ajax-error">
+  <div class="ccx-sidebar-panel" id="ajax-error">
     <h2>${_('Error')}</h2>
     <p>${_("There was an error saving changes.")}</p>
   </div>
-  <div class="poc-sidebar-panel">
+  <div class="ccx-sidebar-panel">
     <h2>${_('Schedule a Unit')}</h2>
-    <form role="form" id="add-unit" name="add-unit" class="poc-form">
+    <form role="form" id="add-unit" name="add-unit" class="ccx-form">
       <div class="field">
         <b>${_('Section')}</b><br/>
         <select name="chapter"></select>
@@ -110,12 +110,12 @@
 
 <script>
 $(function() {
-    schedule_template = _.template($('#poc-schedule-template').html());
-    var view = new edx.pocs.schedule.ScheduleView({
-        el: $('#new-poc-schedule')
+    schedule_template = _.template($('#ccx-schedule-template').html());
+    var view = new edx.ccx.schedule.ScheduleView({
+        el: $('#new-ccx-schedule')
     });
     view.render();
-    //poc_schedule.render();
+    //ccx_schedule.render();
     $('.datepair .time').timepicker({
         'showDuration': true,
         'timeFormat': 'G:i'
diff --git a/lms/templates/pocs/schedule.underscore b/lms/templates/ccx/schedule.underscore
similarity index 94%
rename from lms/templates/pocs/schedule.underscore
rename to lms/templates/ccx/schedule.underscore
index ad3523b590..16dac641ba 100644
--- a/lms/templates/pocs/schedule.underscore
+++ b/lms/templates/ccx/schedule.underscore
@@ -1,4 +1,4 @@
-  <table class="poc-schedule">
+  <table class="ccx-schedule">
     <thead>
       <tr>
         <th><%- gettext('Unit') %></th>
@@ -13,7 +13,7 @@
       <% _.each(chapters, function(chapter) { %>
         <tr class="chapter collapsed" data-location="<%= chapter.location %>" data-depth="1">
           <td class="unit">
-            <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a> 
+            <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a>
             <%= chapter.display_name %>
           </td>
           <td class="date start-date"><a><%= chapter.start %></a></td>
@@ -23,10 +23,10 @@
           </a></td>
         </tr>
         <% _.each(chapter.children, function(child) { %>
-          <tr class="sequential collapsed" data-depth="2" 
+          <tr class="sequential collapsed" data-depth="2"
               data-location="<%= chapter.location %> <%= child.location %>">
             <td class="unit">
-              <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a> 
+              <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a>
               <%= child.display_name %>
             </td>
             <td class="date start-date"><a><%= child.start %></a></td>
diff --git a/lms/templates/pocs/student_admin.html b/lms/templates/ccx/student_admin.html
similarity index 100%
rename from lms/templates/pocs/student_admin.html
rename to lms/templates/ccx/student_admin.html
diff --git a/lms/templates/pocs/unenroll_email_allowedmessage.txt b/lms/templates/ccx/unenroll_email_allowedmessage.txt
similarity index 100%
rename from lms/templates/pocs/unenroll_email_allowedmessage.txt
rename to lms/templates/ccx/unenroll_email_allowedmessage.txt
diff --git a/lms/templates/pocs/unenroll_email_enrolledmessage.txt b/lms/templates/ccx/unenroll_email_enrolledmessage.txt
similarity index 100%
rename from lms/templates/pocs/unenroll_email_enrolledmessage.txt
rename to lms/templates/ccx/unenroll_email_enrolledmessage.txt
diff --git a/lms/templates/pocs/unenroll_email_subject.txt b/lms/templates/ccx/unenroll_email_subject.txt
similarity index 100%
rename from lms/templates/pocs/unenroll_email_subject.txt
rename to lms/templates/ccx/unenroll_email_subject.txt
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index c828bf3085..28a743f0ff 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -243,9 +243,9 @@
             <%include file='dashboard/_dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, show_refund_option = show_refund_option, is_paid_course = is_paid_course, is_course_blocked = is_course_blocked, verification_status=course_verification_status, course_requirements=course_requirements" />
       % endfor
 
-      % if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
-        % for poc, membership, course in poc_membership_triplets:
-            <%include file='pocs/_dashboard_poc_listing.html' args="poc=poc, membership=membership, course=course" />
+      % if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
+        % for ccx, membership, course in ccx_membership_triplets:
+            <%include file='ccx/_dashboard_ccx_listing.html' args="ccx=ccx, membership=membership, course=course" />
         % endfor
       % endif
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html
index 489211d9ee..13e9c6388c 100644
--- a/lms/templates/instructor/instructor_dashboard_2/membership.html
+++ b/lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -244,17 +244,17 @@
     ></div>
   %endif
   
-  %if section_data['access']['instructor'] and settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
+  %if section_data['access']['instructor'] and settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
     <div class="auth-list-container"
-      data-rolename="poc_coach"
-      data-display-name="${_("POC Coaches")}"
+      data-rolename="ccx_coach"
+      data-display-name="${_("CCX Coaches")}"
       data-info-text="
-        ${_("POC Coaches are able to create their own Personal Online Courses "
+        ${_("CCX Coaches are able to create their own Custom Courses "
             "based on this course, which they can use to provide personalized "
             "instruction to their own students based in this course material.")}"
       data-list-endpoint="${section_data['list_course_role_members_url']}"
       data-modify-endpoint="${section_data['modify_access_url']}"
-      data-add-button-label="${_("Add POC Coach")}"
+      data-add-button-label="${_("Add CCX Coach")}"
     ></div>
   %endif
 </div>
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index f011effa7f..625def68e6 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -13,7 +13,7 @@ from status.status import get_site_status_msg
 
 <%! from microsite_configuration import microsite %>
 <%! from microsite_configuration.templatetags.microsite import platform_name %>
-<%! from pocs.overrides import get_current_poc %>
+<%! from ccx.overrides import get_current_ccx %>
 
 ## Provide a hook for themes to inject branding on top.
 <%block name="navigation_top" />
@@ -52,10 +52,10 @@ site_status_msg = get_site_status_msg(course_id)
       ${course.display_number_with_default | h}
       <%
         display_name = course.display_name_with_default
-        if settings.FEATURES.get('PERSONAL_ONLINE_COURSES', False):
-          poc = get_current_poc()
-          if poc:
-            display_name = poc.display_name
+        if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
+          ccx = get_current_ccx()
+          if ccx:
+            display_name = ccx.display_name
       %>
       ${display_name}</h2>
     % endif
diff --git a/lms/urls.py b/lms/urls.py
index da4adcc9a1..56893469c4 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -343,26 +343,26 @@ if settings.COURSEWARE_ENABLED:
         # For the instructor
         url(r'^courses/{}/instructor$'.format(settings.COURSE_ID_PATTERN),
             'instructor.views.instructor_dashboard.instructor_dashboard_2', name="instructor_dashboard"),
-        url(r'^courses/{}/poc_coach$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.dashboard', name='poc_coach_dashboard'),
-        url(r'^courses/{}/create_poc$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.create_poc', name='create_poc'),
-        url(r'^courses/{}/save_poc$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.save_poc', name='save_poc'),
-        url(r'^courses/{}/poc_invite$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.poc_invite', name='poc_invite'),
-        url(r'^courses/{}/poc_schedule$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.poc_schedule', name='poc_schedule'),
-        url(r'^courses/{}/poc_manage_student$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.poc_student_management', name='poc_manage_student'),
-        url(r'^courses/{}/poc_gradebook$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.poc_gradebook', name='poc_gradebook'),
-        url(r'^courses/{}/poc_grades.csv$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.poc_grades_csv', name='poc_grades_csv'),
-        url(r'^courses/{}/poc_set_grading_policy$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.set_grading_policy', name='poc_set_grading_policy'),
-        url(r'^courses/{}/swich_poc(?:/(?P<poc_id>[\d]+))?$'.format(settings.COURSE_ID_PATTERN),
-            'pocs.views.swich_active_poc', name='switch_active_poc'),
+        url(r'^courses/{}/ccx_coach$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.dashboard', name='ccx_coach_dashboard'),
+        url(r'^courses/{}/create_ccx$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.create_ccx', name='create_ccx'),
+        url(r'^courses/{}/save_ccx$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.save_ccx', name='save_ccx'),
+        url(r'^courses/{}/ccx_invite$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.ccx_invite', name='ccx_invite'),
+        url(r'^courses/{}/ccx_schedule$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.ccx_schedule', name='ccx_schedule'),
+        url(r'^courses/{}/ccx_manage_student$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.ccx_student_management', name='ccx_manage_student'),
+        url(r'^courses/{}/ccx_gradebook$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.ccx_gradebook', name='ccx_gradebook'),
+        url(r'^courses/{}/ccx_grades.csv$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.ccx_grades_csv', name='ccx_grades_csv'),
+        url(r'^courses/{}/ccx_set_grading_policy$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.set_grading_policy', name='ccx_set_grading_policy'),
+        url(r'^courses/{}/switch_ccx(?:/(?P<ccx_id>[\d]+))?$'.format(settings.COURSE_ID_PATTERN),
+            'ccx.views.switch_active_ccx', name='switch_active_ccx'),
         url(r'^courses/{}/set_course_mode_price$'.format(settings.COURSE_ID_PATTERN),
             'instructor.views.instructor_dashboard.set_course_mode_price', name="set_course_mode_price"),
         url(r'^courses/{}/instructor/api/'.format(settings.COURSE_ID_PATTERN),

From 3425424696e4b1a1c1c38653a74c702aa1660594 Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Tue, 3 Mar 2015 12:21:12 +0000
Subject: [PATCH 24/29] MIT: CCX. Use request thread local for access control
 decisions.

Use in tabs and other code to show or hide ccx coach tab depending on if the user has the coach role or not
---
 common/lib/xmodule/xmodule/tabs.py | 21 +++++++++++++++------
 lms/djangoapps/ccx/overrides.py    |  8 ++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tabs.py b/common/lib/xmodule/xmodule/tabs.py
index 28c9a12393..2b271de1e3 100644
--- a/common/lib/xmodule/xmodule/tabs.py
+++ b/common/lib/xmodule/xmodule/tabs.py
@@ -752,12 +752,21 @@ class CcxCoachTab(CourseTab):
         )
 
     def can_display(self, course, settings, *args, **kw):
-        # TODO Check that user actually has 'ccx_coach' role on course
-        #      this is difficult to do because the user isn't passed in.
-        #      We need either a hack or an architectural realignment.
-        return (
-            settings.FEATURES.get('CUSTOM_COURSES_EDX', False) and
-            super(CcxCoachTab, self).can_display(course, settings, *args, **kw))
+        user_is_coach = False
+        if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
+            from opaque_keys.edx.locations import SlashSeparatedCourseKey
+            from student.roles import CourseCcxCoachRole
+            from ccx.overrides import get_current_request
+            course_id = course.id.to_deprecated_string()
+            course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
+            role = CourseCcxCoachRole(course_key)
+            request = get_current_request()
+            if request is not None:
+                user_is_coach = role.has_user(request.user)
+        super_can_display = super(CcxCoachTab, self).can_display(
+            course, settings, *args, **kw
+        )
+        return (user_is_coach and super_can_display)
 
 
 class CourseTabList(List):
diff --git a/lms/djangoapps/ccx/overrides.py b/lms/djangoapps/ccx/overrides.py
index 88e04d7b36..9a2c5d4e98 100644
--- a/lms/djangoapps/ccx/overrides.py
+++ b/lms/djangoapps/ccx/overrides.py
@@ -32,6 +32,7 @@ class _CcxContext(threading.local):
     keeps track of the CCX currently set as the context.
     """
     ccx = None
+    request = None
 
 
 _CCX_CONTEXT = _CcxContext()
@@ -60,6 +61,10 @@ def get_current_ccx():
         return ccx
 
 
+def get_current_request():
+    request = _CCX_CONTEXT.request
+    return request
+
 def get_override_for_ccx(ccx, block, name, default=None):
     """
     Gets the value of the overridden field for the `ccx`.  `block` and `name`
@@ -151,9 +156,12 @@ class CcxMiddleware(object):
                 _CCX_CONTEXT.ccx = None
                 request.session.pop(ACTIVE_CCX_KEY)
 
+        _CCX_CONTEXT.request = request
+
     def process_response(self, request, response):
         """
         Clean up afterwards.
         """
         _CCX_CONTEXT.ccx = None
+        _CCX_CONTEXT.request = None
         return response

From b3da2a54bb900f38c1049d91ddb5e4290beb1c8c Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Wed, 4 Mar 2015 13:01:54 -0600
Subject: [PATCH 25/29] MIT: CCX.  Fix issues identified in code review

Original Commit Messages:

use edx's own get_parent method, rather than our own.

add field to unique constraint to avoid MultipleObjectsReturned in case of multiple browser clicks on submit

fix 0011 migration, inherit from TimeStampedField and add composite index (migration only)

fix bug where adding an already registered user to a ccx would cause a crash due to an undefined variable

add assertNumQueries tests to test modules where override field providers are used

remove unnecessary teardown

implement recommended style for checking empty list

import utility methods rather than use duplicate code

added comment explaining date conversion to string for json

add logging for invalid users or emails when enrolling students

add comment about xmodule user state

avoid using get_or_create, which seems to be causing a race condition on schedule change save

relocate badly placed edvent handlers to fix multiple submit problem
---
 common/lib/xmodule/xmodule/course_module.py   |   3 +
 lms/djangoapps/ccx/overrides.py               |  19 ++-
 lms/djangoapps/ccx/tests/test_overrides.py    |  42 ++---
 lms/djangoapps/ccx/tests/test_utils.py        |  41 ++---
 lms/djangoapps/ccx/tests/test_views.py        |  16 +-
 lms/djangoapps/ccx/utils.py                   |   2 +-
 lms/djangoapps/ccx/views.py                   |  15 +-
 lms/djangoapps/courseware/field_overrides.py  |  17 +-
 ...erride_course_id_location_student__add_.py | 138 ++++++++++++++++
 ...rride_created__add_field_studentfieldov.py | 155 ++++++++++++++++++
 lms/djangoapps/courseware/models.py           |   6 +-
 lms/djangoapps/instructor/tests/test_tools.py |   6 +
 lms/static/js/ccx/schedule.js                 | 111 ++++++-------
 13 files changed, 437 insertions(+), 134 deletions(-)
 create mode 100644 lms/djangoapps/courseware/migrations/0012_auto__del_unique_studentfieldoverride_course_id_location_student__add_.py
 create mode 100644 lms/djangoapps/courseware/migrations/0013_auto__add_field_studentfieldoverride_created__add_field_studentfieldov.py

diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 08844018af..b522d51a0f 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -1213,12 +1213,15 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
 
 
         """
+        # If this descriptor has been bound to a student, return the corresponding
+        # XModule. If not, just use the descriptor itself
         try:
             module = getattr(self, '_xmodule', None)
             if not module:
                 module = self
         except UndefinedContext:
             module = self
+
         all_descriptors = []
         graded_sections = {}
 
diff --git a/lms/djangoapps/ccx/overrides.py b/lms/djangoapps/ccx/overrides.py
index 9a2c5d4e98..aced5410f8 100644
--- a/lms/djangoapps/ccx/overrides.py
+++ b/lms/djangoapps/ccx/overrides.py
@@ -7,6 +7,8 @@ import threading
 
 from contextlib import contextmanager
 
+from django.db import transaction, IntegrityError
+
 from courseware.field_overrides import FieldOverrideProvider
 from ccx import ACTIVE_CCX_KEY
 
@@ -97,20 +99,29 @@ def _get_overrides_for_ccx(ccx, block):
     return overrides
 
 
+@transaction.commit_on_success
 def override_field_for_ccx(ccx, block, name, value):
     """
     Overrides a field for the `ccx`.  `block` and `name` specify the block
     and the name of the field on that block to override.  `value` is the
     value to set for the given field.
     """
-    override, created = CcxFieldOverride.objects.get_or_create(
+    field = block.fields[name]
+    value = json.dumps(field.to_json(value))
+    try:
+        override = CcxFieldOverride.objects.create(
+        ccx=ccx,
+        location=block.location,
+        field=name,
+        value=value)
+    except IntegrityError:
+        transaction.commit()
+        override = CcxFieldOverride.objects.get(
         ccx=ccx,
         location=block.location,
         field=name)
-    field = block.fields[name]
-    override.value = json.dumps(field.to_json(value))
+        override.value = value
     override.save()
-
     if hasattr(block, '_ccx_overrides'):
         del block._ccx_overrides[ccx.id]
 
diff --git a/lms/djangoapps/ccx/tests/test_overrides.py b/lms/djangoapps/ccx/tests/test_overrides.py
index 875a1c0249..c3e624a769 100644
--- a/lms/djangoapps/ccx/tests/test_overrides.py
+++ b/lms/djangoapps/ccx/tests/test_overrides.py
@@ -11,6 +11,7 @@ from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from ..models import CustomCourseForEdX
 from ..overrides import override_field_for_ccx
 
+from .test_views import flatten, iter_blocks
 
 @override_settings(FIELD_OVERRIDE_PROVIDERS=(
     'ccx.overrides.CustomCoursesForEdxOverrideProvider',))
@@ -76,6 +77,28 @@ class TestFieldOverrides(ModuleStoreTestCase):
         override_field_for_ccx(self.ccx, chapter, 'start', ccx_start)
         self.assertEquals(chapter.start, ccx_start)
 
+    def test_override_num_queries(self):
+        """
+        Test that overriding and accessing a field produce same number of queries.
+        """
+        ccx_start = datetime.datetime(2014, 12, 25, 00, 00, tzinfo=pytz.UTC)
+        chapter = self.course.get_children()[0]
+        with self.assertNumQueries(4):
+            override_field_for_ccx(self.ccx, chapter, 'start', ccx_start)
+            dummy = chapter.start
+
+    def test_overriden_field_access_produces_no_extra_queries(self):
+        """
+        Test no extra queries when accessing an overriden field more than once.
+        """
+        ccx_start = datetime.datetime(2014, 12, 25, 00, 00, tzinfo=pytz.UTC)
+        chapter = self.course.get_children()[0]
+        with self.assertNumQueries(4):
+            override_field_for_ccx(self.ccx, chapter, 'start', ccx_start)
+            dummy1 = chapter.start
+            dummy2 = chapter.start
+            dummy3 = chapter.start
+
     def test_override_is_inherited(self):
         """
         Test that sequentials inherit overridden start date from chapter.
@@ -98,22 +121,3 @@ class TestFieldOverrides(ModuleStoreTestCase):
         override_field_for_ccx(self.ccx, chapter, 'due', ccx_due)
         vertical = chapter.get_children()[0].get_children()[0]
         self.assertEqual(vertical.due, ccx_due)
-
-
-def flatten(seq):
-    """
-    For [[1, 2], [3, 4]] returns [1, 2, 3, 4].  Does not recurse.
-    """
-    return [x for sub in seq for x in sub]
-
-
-def iter_blocks(course):
-    """
-    Returns an iterator over all of the blocks in a course.
-    """
-    def visit(block):
-        yield block
-        for child in block.get_children():
-            for descendant in visit(child):  # wish they'd backport yield from
-                yield descendant
-    return visit(course)
diff --git a/lms/djangoapps/ccx/tests/test_utils.py b/lms/djangoapps/ccx/tests/test_utils.py
index 764dfca2ad..d9c21152f0 100644
--- a/lms/djangoapps/ccx/tests/test_utils.py
+++ b/lms/djangoapps/ccx/tests/test_utils.py
@@ -253,7 +253,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         """enroll a non-user email and send an enrollment email to them
         """
         # ensure no emails are in the outbox now
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         test_email = "nobody@nowhere.com"
         before, after = self.call_FUT(
             student_email=test_email, email_students=True
@@ -273,7 +273,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         """
         self.create_user()
         # ensure no emails are in the outbox now
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         before, after = self.call_FUT(email_students=True)
 
         # there should be a membership set for this email address now
@@ -290,7 +290,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         """
         self.register_user_in_ccx()
         # ensure no emails are in the outbox now
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         before, after = self.call_FUT(email_students=True)
 
         # there should be a membership set for this email address now
@@ -306,7 +306,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         """register a non-user via email address but send no email
         """
         # ensure no emails are in the outbox now
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         test_email = "nobody@nowhere.com"
         before, after = self.call_FUT(
             student_email=test_email, email_students=False
@@ -317,13 +317,13 @@ class TestEnrollEmail(ModuleStoreTestCase):
         for state in [before, after]:
             self.check_enrollment_state(state, False, None, False)
         # ensure there are still no emails in the outbox now
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
 
     def test_enroll_non_member_no_email(self):
         """register a non-member but send no email"""
         self.create_user()
         # ensure no emails are in the outbox now
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         before, after = self.call_FUT(email_students=False)
 
         # there should be a membership set for this email address now
@@ -331,14 +331,14 @@ class TestEnrollEmail(ModuleStoreTestCase):
         self.check_enrollment_state(before, False, self.user, True)
         self.check_enrollment_state(after, True, self.user, True)
         # ensure there are still no emails in the outbox now
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
 
     def test_enroll_member_no_email(self):
         """enroll a member but send no email
         """
         self.register_user_in_ccx()
         # ensure no emails are in the outbox now
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         before, after = self.call_FUT(email_students=False)
 
         # there should be a membership set for this email address now
@@ -346,7 +346,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         for state in [before, after]:
             self.check_enrollment_state(state, True, self.user, True)
         # ensure there are still no emails in the outbox now
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
 
 
 # TODO: deal with changes in behavior for auto_enroll
@@ -364,11 +364,6 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.ccx = CcxFactory(course_id=course.id, coach=coach)
         self.outbox = self.get_outbox()
 
-    def tearDown(self):
-        for attr in ['user', 'email']:
-            if hasattr(self, attr):
-                delattr(self, attr)
-
     def get_outbox(self):
         """Return the django mail outbox"""
         from django.core import mail
@@ -428,7 +423,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.make_ccx_future_membership()
         # assert that a membership exists and that no emails have been sent
         self.assertTrue(self.check_membership(future=True))
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         # unenroll the student
         before, after = self.call_FUT(email_students=True)
 
@@ -447,7 +442,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.make_ccx_membership()
         # assert that a membership exists and that no emails have been sent
         self.assertTrue(self.check_membership())
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         # unenroll the student
         before, after = self.call_FUT(email_students=True)
 
@@ -467,7 +462,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.make_ccx_future_membership()
         # assert that a membership exists and that no emails have been sent
         self.assertTrue(self.check_membership(future=True))
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         # unenroll the student
         before, after = self.call_FUT()
 
@@ -477,7 +472,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         for state in [before, after]:
             self.check_enrollment_state(state, False, None, False)
         # no email was sent to the student
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
 
     def test_unenroll_member_no_email(self):
         """unenroll a current member but send no email
@@ -485,7 +480,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.make_ccx_membership()
         # assert that a membership exists and that no emails have been sent
         self.assertTrue(self.check_membership())
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
         # unenroll the student
         before, after = self.call_FUT()
 
@@ -495,7 +490,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.check_enrollment_state(after, False, self.user, True)
         self.check_enrollment_state(before, True, self.user, True)
         # no email was sent to the student
-        self.assertEqual(len(self.outbox), 0)
+        self.assertEqual(self.outbox, [])
 
 
 class TestUserCCXList(ModuleStoreTestCase):
@@ -530,16 +525,16 @@ class TestUserCCXList(ModuleStoreTestCase):
 
     def test_anonymous_sees_no_ccx(self):
         memberships = self.call_FUT(self.anonymous)
-        self.assertEqual(len(memberships), 0)
+        self.assertEqual(memberships, [])
 
     def test_unenrolled_sees_no_ccx(self):
         memberships = self.call_FUT(self.user)
-        self.assertEqual(len(memberships), 0)
+        self.assertEqual(memberships, [])
 
     def test_enrolled_inactive_sees_no_ccx(self):
         self.register_user_in_ccx()
         memberships = self.call_FUT(self.user)
-        self.assertEqual(len(memberships), 0)
+        self.assertEqual(memberships, [])
 
     def test_enrolled_sees_a_ccx(self):
         self.register_user_in_ccx(active=True)
diff --git a/lms/djangoapps/ccx/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py
index 1b4cb1db69..3f03288859 100644
--- a/lms/djangoapps/ccx/tests/test_views.py
+++ b/lms/djangoapps/ccx/tests/test_views.py
@@ -223,7 +223,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         enrollment = CourseEnrollmentFactory(course_id=self.course.id)
         student = enrollment.user
         outbox = self.get_outbox()
-        self.assertEqual(len(outbox), 0)
+        self.assertEqual(outbox, [])
 
         url = reverse(
             'ccx_invite',
@@ -254,7 +254,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         enrollment = CourseEnrollmentFactory(course_id=self.course.id)
         student = enrollment.user
         outbox = self.get_outbox()
-        self.assertEqual(len(outbox), 0)
+        self.assertEqual(outbox, [])
         # student is member of CCX:
         CcxMembershipFactory(ccx=ccx, student=student)
 
@@ -286,7 +286,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.make_coach()
         ccx = self.make_ccx()
         outbox = self.get_outbox()
-        self.assertEqual(len(outbox), 0)
+        self.assertEqual(outbox, [])
 
         url = reverse(
             'ccx_invite',
@@ -318,7 +318,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         ccx = self.make_ccx()
         outbox = self.get_outbox()
         CcxFutureMembershipFactory(ccx=ccx, email=test_email)
-        self.assertEqual(len(outbox), 0)
+        self.assertEqual(outbox, [])
 
         url = reverse(
             'ccx_invite',
@@ -351,7 +351,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         student = enrollment.user
         # no emails have been sent so far
         outbox = self.get_outbox()
-        self.assertEqual(len(outbox), 0)
+        self.assertEqual(outbox, [])
 
         url = reverse(
             'ccx_manage_student',
@@ -366,7 +366,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         # we were redirected to our current location
         self.assertEqual(len(response.redirect_chain), 1)
         self.assertTrue(302 in response.redirect_chain[0])
-        self.assertEqual(len(outbox), 0)
+        self.assertEqual(outbox, [])
         # a CcxMembership exists for this student
         self.assertTrue(
             CcxMembership.objects.filter(ccx=ccx, student=student).exists()
@@ -382,7 +382,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         CcxMembershipFactory(ccx=ccx, student=student)
         # no emails have been sent so far
         outbox = self.get_outbox()
-        self.assertEqual(len(outbox), 0)
+        self.assertEqual(outbox, [])
 
         url = reverse(
             'ccx_manage_student',
@@ -397,7 +397,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         # we were redirected to our current location
         self.assertEqual(len(response.redirect_chain), 1)
         self.assertTrue(302 in response.redirect_chain[0])
-        self.assertEqual(len(outbox), 0)
+        self.assertEqual(outbox, [])
         # a CcxMembership exists for this student
         self.assertFalse(
             CcxMembership.objects.filter(ccx=ccx, student=student).exists()
diff --git a/lms/djangoapps/ccx/utils.py b/lms/djangoapps/ccx/utils.py
index a587bce4ea..8dca532dd4 100644
--- a/lms/djangoapps/ccx/utils.py
+++ b/lms/djangoapps/ccx/utils.py
@@ -65,8 +65,8 @@ def enroll_email(ccx, student_email, auto_enroll=False, email_students=False, em
     previous_state = EmailEnrollmentState(ccx, student_email)
 
     if previous_state.user:
+        user = User.objects.get(email=student_email)
         if not previous_state.in_ccx:
-            user = User.objects.get(email=student_email)
             membership = CcxMembership(
                 ccx=ccx, student=user, active=True
             )
diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index ddedf4fc3e..a42018639f 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -32,7 +32,7 @@ from courseware.grades import iterate_grades_for
 from courseware.model_data import FieldDataCache
 from courseware.module_render import get_module_for_descriptor
 from edxmako.shortcuts import render_to_response
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from opaque_keys.edx.keys import CourseKey
 from student.roles import CourseCcxCoachRole
 
 from instructor.offline_gradecalc import student_grades
@@ -69,7 +69,7 @@ def coach_dashboard(view):
         Wraps the view function, performing access check, loading the course,
         and modifying the view's call signature.
         """
-        course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
+        course_key = CourseKey.from_string(course_id)
         role = CourseCcxCoachRole(course_key)
         if not role.has_user(request.user):
             return HttpResponseForbidden(
@@ -283,6 +283,8 @@ def get_ccx_schedule(course, ccx):
     def visit(node, depth=1):
         """
         Recursive generator function which yields CCX schedule nodes.
+        We convert dates to string to get them ready for use by the js date
+        widgets, which use text inputs.
         """
         for child in node.get_children():
             start = get_override_for_ccx(ccx, child, 'start', None)
@@ -358,7 +360,7 @@ def ccx_invite(request, course):
             if action == "Unenroll":
                 unenroll_email(ccx, email, email_students=email_students)
         except ValidationError:
-            pass  # maybe log this?
+            log.info('Invalid user name or email when trying to invite students: %s', email)
     url = reverse('ccx_coach_dashboard', kwargs={'course_id': course.id})
     return redirect(url)
 
@@ -389,7 +391,7 @@ def ccx_student_management(request, course):
         elif action == 'revoke':
             unenroll_email(ccx, email, email_students=False)
     except ValidationError:
-        pass  # XXX: log, report?
+        log.info('Invalid user name or email when trying to enroll student: %s', email)
 
     url = reverse('ccx_coach_dashboard', kwargs={'course_id': course.id})
     return redirect(url)
@@ -499,8 +501,7 @@ def ccx_grades_csv(request, course):
 def switch_active_ccx(request, course_id, ccx_id=None):
     """set the active CCX for the logged-in user
     """
-    user = request.user
-    course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
+    course_key = CourseKey.from_string(course_id)
     # will raise Http404 if course_id is bad
     course = get_course_by_id(course_key)
     course_url = reverse(
@@ -509,7 +510,7 @@ def switch_active_ccx(request, course_id, ccx_id=None):
     if ccx_id is not None:
         try:
             requested_ccx = CustomCourseForEdX.objects.get(pk=ccx_id)
-            assert requested_ccx.course_id.to_deprecated_string() == course_id
+            assert unicode(requested_ccx.course_id) == course_id
             if not CcxMembership.objects.filter(
                 ccx=requested_ccx, student=request.user, active=True
             ).exists():
diff --git a/lms/djangoapps/courseware/field_overrides.py b/lms/djangoapps/courseware/field_overrides.py
index a84dc001b4..e7b0c8e121 100644
--- a/lms/djangoapps/courseware/field_overrides.py
+++ b/lms/djangoapps/courseware/field_overrides.py
@@ -199,20 +199,7 @@ def _lineage(block):
     Returns an iterator over all ancestors of the given block, starting with
     its immediate parent and ending at the root of the block tree.
     """
-    parent = _get_parent(block)
+    parent = block.get_parent()
     while parent:
         yield parent
-        parent = _get_parent(parent)
-
-
-def _get_parent(block):
-    """
-    Gets parent of a block, trying to cache result.
-    """
-    if not hasattr(block, '_parent'):
-        store = modulestore()
-        # Call to get_parent_location is fairly expensive.  Is there a more
-        # performant way to get at the ancestors of a block?
-        location = store.get_parent_location(block.location)
-        block._parent = store.get_item(location) if location else None
-    return block._parent
+        parent = parent.get_parent()
diff --git a/lms/djangoapps/courseware/migrations/0012_auto__del_unique_studentfieldoverride_course_id_location_student__add_.py b/lms/djangoapps/courseware/migrations/0012_auto__del_unique_studentfieldoverride_course_id_location_student__add_.py
new file mode 100644
index 0000000000..d79f119a24
--- /dev/null
+++ b/lms/djangoapps/courseware/migrations/0012_auto__del_unique_studentfieldoverride_course_id_location_student__add_.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding unique constraint on 'StudentFieldOverride', fields ['course_id', 'field', 'location', 'student']
+        db.create_unique('courseware_studentfieldoverride', ['course_id', 'field', 'location', 'student_id'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'StudentFieldOverride', fields ['course_id', 'field', 'location', 'student']
+        db.delete_unique('courseware_studentfieldoverride', ['course_id', 'field', 'location', 'student_id'])
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'courseware.offlinecomputedgrade': {
+            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'OfflineComputedGrade'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'gradeset': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'courseware.offlinecomputedgradelog': {
+            'Meta': {'ordering': "['-created']", 'object_name': 'OfflineComputedGradeLog'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nstudents': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'seconds': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'courseware.studentfieldoverride': {
+            'Meta': {'unique_together': "(('course_id', 'field', 'location', 'student'),)", 'object_name': 'StudentFieldOverride'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.studentmodule': {
+            'Meta': {'unique_together': "(('student', 'module_state_key', 'course_id'),)", 'object_name': 'StudentModule'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'done': ('django.db.models.fields.CharField', [], {'default': "'na'", 'max_length': '8', 'db_index': 'True'}),
+            'grade': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_state_key': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_column': "'module_id'", 'db_index': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'courseware.studentmodulehistory': {
+            'Meta': {'object_name': 'StudentModuleHistory'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'student_module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['courseware.StudentModule']"}),
+            'version': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'courseware.xmodulestudentinfofield': {
+            'Meta': {'unique_together': "(('student', 'field_name'),)", 'object_name': 'XModuleStudentInfoField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.xmodulestudentprefsfield': {
+            'Meta': {'unique_together': "(('student', 'module_type', 'field_name'),)", 'object_name': 'XModuleStudentPrefsField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.xmoduleuserstatesummaryfield': {
+            'Meta': {'unique_together': "(('usage_id', 'field_name'),)", 'object_name': 'XModuleUserStateSummaryField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'usage_id': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        }
+    }
+
+    complete_apps = ['courseware']
diff --git a/lms/djangoapps/courseware/migrations/0013_auto__add_field_studentfieldoverride_created__add_field_studentfieldov.py b/lms/djangoapps/courseware/migrations/0013_auto__add_field_studentfieldoverride_created__add_field_studentfieldov.py
new file mode 100644
index 0000000000..bd67226137
--- /dev/null
+++ b/lms/djangoapps/courseware/migrations/0013_auto__add_field_studentfieldoverride_created__add_field_studentfieldov.py
@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'StudentFieldOverride.created'
+        db.add_column('courseware_studentfieldoverride', 'created',
+                      self.gf('model_utils.fields.AutoCreatedField')(default=datetime.datetime.now),
+                      keep_default=False)
+
+        # Adding field 'StudentFieldOverride.modified'
+        db.add_column('courseware_studentfieldoverride', 'modified',
+                      self.gf('model_utils.fields.AutoLastModifiedField')(default=datetime.datetime.now),
+                      keep_default=False)
+
+        # Adding index on 'StudentFieldOverride', fields ['course_id', 'location', 'student']
+        db.create_index('courseware_studentfieldoverride', ['course_id', 'location', 'student_id'])
+
+
+    def backwards(self, orm):
+        # Deleting field 'StudentFieldOverride.created'
+        db.delete_column('courseware_studentfieldoverride', 'created')
+
+        # Deleting field 'StudentFieldOverride.modified'
+        db.delete_column('courseware_studentfieldoverride', 'modified')
+
+        # Removing index on 'StudentFieldOverride', fields ['course_id', 'location', 'student']
+        db.delete_index('courseware_studentfieldoverride', ['course_id', 'location', 'student_id'])
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'courseware.offlinecomputedgrade': {
+            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'OfflineComputedGrade'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'gradeset': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'courseware.offlinecomputedgradelog': {
+            'Meta': {'ordering': "['-created']", 'object_name': 'OfflineComputedGradeLog'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nstudents': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'seconds': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'courseware.studentfieldoverride': {
+            'Meta': {'unique_together': "(('course_id', 'field', 'location', 'student'),)", 'object_name': 'StudentFieldOverride'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.studentmodule': {
+            'Meta': {'unique_together': "(('student', 'module_state_key', 'course_id'),)", 'object_name': 'StudentModule'},
+            'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'done': ('django.db.models.fields.CharField', [], {'default': "'na'", 'max_length': '8', 'db_index': 'True'}),
+            'grade': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_state_key': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_column': "'module_id'", 'db_index': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'courseware.studentmodulehistory': {
+            'Meta': {'object_name': 'StudentModuleHistory'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'student_module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['courseware.StudentModule']"}),
+            'version': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'courseware.xmodulestudentinfofield': {
+            'Meta': {'unique_together': "(('student', 'field_name'),)", 'object_name': 'XModuleStudentInfoField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.xmodulestudentprefsfield': {
+            'Meta': {'unique_together': "(('student', 'module_type', 'field_name'),)", 'object_name': 'XModuleStudentPrefsField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_type': ('xmodule_django.models.BlockTypeKeyField', [], {'max_length': '64', 'db_index': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        },
+        'courseware.xmoduleuserstatesummaryfield': {
+            'Meta': {'unique_together': "(('usage_id', 'field_name'),)", 'object_name': 'XModuleUserStateSummaryField'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'field_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'usage_id': ('xmodule_django.models.LocationKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {'default': "'null'"})
+        }
+    }
+
+    complete_apps = ['courseware']
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index 75a7afffa3..0b5e650677 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -18,6 +18,8 @@ from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
+from model_utils.models import TimeStampedModel
+
 from xmodule_django.models import CourseKeyField, LocationKeyField, BlockTypeKeyField
 
 
@@ -232,7 +234,7 @@ class OfflineComputedGradeLog(models.Model):
         return "[OCGLog] %s: %s" % (self.course_id.to_deprecated_string(), self.created)  # pylint: disable=no-member
 
 
-class StudentFieldOverride(models.Model):
+class StudentFieldOverride(TimeStampedModel):
     """
     Holds the value of a specific field overriden for a student.  This is used
     by the code in the `courseware.student_field_overrides` module to provide
@@ -243,7 +245,7 @@ class StudentFieldOverride(models.Model):
     student = models.ForeignKey(User, db_index=True)
 
     class Meta:   # pylint: disable=missing-docstring
-        unique_together = (('course_id', 'location', 'student'),)
+        unique_together = (('course_id', 'field', 'location', 'student'),)
 
     field = models.CharField(max_length=255)
     value = models.TextField(default='null')
diff --git a/lms/djangoapps/instructor/tests/test_tools.py b/lms/djangoapps/instructor/tests/test_tools.py
index 1f6e596b63..7be040a674 100644
--- a/lms/djangoapps/instructor/tests/test_tools.py
+++ b/lms/djangoapps/instructor/tests/test_tools.py
@@ -242,6 +242,12 @@ class TestSetDueDateExtension(ModuleStoreTestCase):
         self.assertEqual(self.homework.due, extended)
         self.assertEqual(self.assignment.due, extended)
 
+    def test_set_due_date_extension_num_queries(self):
+        extended = datetime.datetime(2013, 12, 25, 0, 0, tzinfo=utc)
+        with self.assertNumQueries(4):
+            tools.set_due_date_extension(self.course, self.week1, self.user, extended)
+            self._clear_field_data_cache()
+
     def test_set_due_date_extension_invalid_date(self):
         extended = datetime.datetime(2009, 1, 1, 0, 0, tzinfo=utc)
         with self.assertRaises(tools.DashboardError):
diff --git a/lms/static/js/ccx/schedule.js b/lms/static/js/ccx/schedule.js
index 328019c02a..9773669f49 100644
--- a/lms/static/js/ccx/schedule.js
+++ b/lms/static/js/ccx/schedule.js
@@ -54,55 +54,6 @@ var edx = edx || {};
 		self.schedule_collection.set(self.schedule);
 	        self.render();
 	    });
-        },
-
-        render: function() {
-	    self.schedule = this.schedule_collection.toJSON();
-            self.hidden = this.pruned(self.schedule, function(node) {
-              return node.hidden || node.category !== 'vertical'});
-            this.showing = this.pruned(self.schedule, function(node) {
-              return !node.hidden});
-            this.$el.html(schedule_template({chapters: this.showing}));
-            $('table.ccx-schedule .sequential,.vertical').hide();
-            $('table.ccx-schedule .toggle-collapse').on('click', this.toggle_collapse);
-	    //
-	    // Hidden hover fields for empty date fields
-	    $('table.ccx-schedule .date a').each(function() {
-	      if (! $(this).text()) {
-		$(this).text('Set date').addClass('empty');
-	      }
-	    });
-	    
-	    // Handle date edit clicks
-	    $('table.ccx-schedule .date a').attr('href', '#enter-date-modal')
-	      .leanModal({closeButton: '.close-modal'});
-	    $('table.ccx-schedule .due-date a').on('click', this.enterNewDate('due'));
-	    $('table.ccx-schedule .start-date a').on('click', this.enterNewDate('start'));
-	    // Click handler for remove all
-	    $('table.ccx-schedule a#remove-all').on('click', function(event) {
-	      event.preventDefault();
-	      self.schedule_apply(self.schedule, self.hide);
-	      self.dirty = true;
-	      self.schedule_collection.set(self.schedule);
-	      self.render();
-	    });
-
-	    // Show or hide form
-	    if (this.hidden.length) {
-	      // Populate chapters select, depopulate others
-	      this.chapter_select.html('')
-		.append('<option value="none">'+gettext("Select a chapter")+'...</option>')
-		.append(self.schedule_options(this.hidden));
-	      this.sequential_select.html('').prop('disabled', true);
-	      this.vertical_select.html('').prop('disabled', true);
-	      $('form#add-unit').show();
-	      $('#all-units-added').hide();
-	      $('#add-unit-button').prop('disabled', true);
-	    }
-	    else {
-	      $('form#add-unit').hide();
-	      $('#all-units-added').show();
-	    }
 
 	    // Add unit handlers
 	    this.chapter_select.on('change', function(event) {
@@ -174,6 +125,44 @@ var edx = edx || {};
 	      self.render();
 	    });
 
+	    // Handle save button
+	    $('#dirty-schedule #save-changes').on('click', function(event) {
+		event.preventDefault();
+		self.save();
+	    });
+
+        },
+
+        render: function() {
+	    self.schedule = this.schedule_collection.toJSON();
+            self.hidden = this.pruned(self.schedule, function(node) {
+              return node.hidden || node.category !== 'vertical'});
+            this.showing = this.pruned(self.schedule, function(node) {
+              return !node.hidden});
+            this.$el.html(schedule_template({chapters: this.showing}));
+            $('table.ccx-schedule .sequential,.vertical').hide();
+            $('table.ccx-schedule .toggle-collapse').on('click', this.toggle_collapse);
+	    //
+	    // Hidden hover fields for empty date fields
+	    $('table.ccx-schedule .date a').each(function() {
+	      if (! $(this).text()) {
+		$(this).text('Set date').addClass('empty');
+	      }
+	    });
+	    
+	    // Handle date edit clicks
+	    $('table.ccx-schedule .date a').attr('href', '#enter-date-modal')
+	      .leanModal({closeButton: '.close-modal'});
+	    $('table.ccx-schedule .due-date a').on('click', this.enterNewDate('due'));
+	    $('table.ccx-schedule .start-date a').on('click', this.enterNewDate('start'));
+	    // Click handler for remove all
+	    $('table.ccx-schedule a#remove-all').on('click', function(event) {
+	      event.preventDefault();
+	      self.schedule_apply(self.schedule, self.hide);
+	      self.dirty = true;
+	      self.schedule_collection.set(self.schedule);
+	      self.render();
+	    });
 	    // Remove unit handler
 	    $('table.ccx-schedule a.remove-unit').on('click', function(event) {
 	      var row = $(this).closest('tr'),
@@ -185,16 +174,28 @@ var edx = edx || {};
 	      self.render(); 
 	    });
 
+
+	    // Show or hide form
+	    if (this.hidden.length) {
+	      // Populate chapters select, depopulate others
+	      this.chapter_select.html('')
+		.append('<option value="none">'+gettext("Select a chapter")+'...</option>')
+		.append(self.schedule_options(this.hidden));
+	      this.sequential_select.html('').prop('disabled', true);
+	      this.vertical_select.html('').prop('disabled', true);
+	      $('form#add-unit').show();
+	      $('#all-units-added').hide();
+	      $('#add-unit-button').prop('disabled', true);
+	    }
+	    else {
+	      $('form#add-unit').hide();
+	      $('#all-units-added').show();
+	    }
+
 	    // Show or hide save button
 	    if (this.dirty) $('#dirty-schedule').show()
 	    else $('#dirty-schedule').hide();
 
-	    // Handle save button
-	    $('#dirty-schedule #save-changes').on('click', function(event) {
-		event.preventDefault();
-		self.save();
-	    });
-
 	    $('#ajax-error').hide();
 
 	    return this;

From 9ddee93401741ccf70590afd8c8cef03a51c6861 Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Tue, 3 Mar 2015 11:55:03 -0600
Subject: [PATCH 26/29] MIT: CCX.  Code Quality fixes

add doc strings; fix pep8 warning
address some minor issues brought up by the code review process
---
 common/djangoapps/student/views.py            |   8 +-
 common/lib/xmodule/xmodule/course_module.py   |  14 +--
 common/lib/xmodule/xmodule/tabs.py            |  13 +-
 lms/djangoapps/ccx/__init__.py                |   3 +
 lms/djangoapps/ccx/models.py                  |  12 +-
 lms/djangoapps/ccx/overrides.py               |  44 ++++---
 lms/djangoapps/ccx/tests/factories.py         |  16 ++-
 lms/djangoapps/ccx/tests/test_models.py       |  33 +++--
 lms/djangoapps/ccx/tests/test_overrides.py    |  20 +--
 lms/djangoapps/ccx/tests/test_utils.py        |  95 ++++++++------
 lms/djangoapps/ccx/tests/test_views.py        | 119 +++++++++++-------
 lms/djangoapps/ccx/utils.py                   |  29 +++--
 lms/djangoapps/ccx/views.py                   |  38 +++---
 lms/djangoapps/courseware/field_overrides.py  |   1 -
 lms/djangoapps/courseware/grades.py           |   1 -
 lms/djangoapps/courseware/models.py           |   9 +-
 .../courseware/student_field_overrides.py     |   6 +-
 .../courseware/tests/test_field_overrides.py  |   1 +
 lms/djangoapps/instructor/views/api.py        |   4 +-
 19 files changed, 279 insertions(+), 187 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index d87f893708..cce7a1785d 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -1821,12 +1821,12 @@ def activate_account(request, key):
             # enroll student in any pending CCXs he/she may have if auto_enroll flag is set
             if settings.FEATURES.get('CUSTOM_COURSES_EDX'):
                 from ccx.models import CcxMembership, CcxFutureMembership
-                pfms = CcxFutureMembership.objects.filter(
+                ccxfms = CcxFutureMembership.objects.filter(
                     email=student[0].email
                 )
-                for pfm in pfms:
-                    if pfm.auto_enroll:
-                        CcxMembership.auto_enroll(student[0], pfm)
+                for ccxfm in ccxfms:
+                    if ccxfm.auto_enroll:
+                        CcxMembership.auto_enroll(student[0], ccxfm)
 
         resp = render_to_response(
             "registration/activation_complete.html",
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index b522d51a0f..0628743910 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -1225,25 +1225,17 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
         all_descriptors = []
         graded_sections = {}
 
-        def yield_descendents(module):
-            for child in module.get_children():
+        def yield_descriptor_descendents(module_descriptor):
+            for child in module_descriptor.get_children():
                 yield child
-                for module_descriptor in yield_descendents(child):
+                for module_descriptor in yield_descriptor_descendents(child):
                     yield module_descriptor
 
-<<<<<<< HEAD
         for chapter in self.get_children():
             for section in chapter.get_children():
                 if section.graded:
                     xmoduledescriptors = list(yield_descriptor_descendents(section))
                     xmoduledescriptors.append(section)
-=======
-        for c in module.get_children():
-            for s in c.get_children():
-                if s.graded:
-                    xmoduledescriptors = list(yield_descendents(s))
-                    xmoduledescriptors.append(s)
->>>>>>> Hide course blocks not in the CCX from view for coaches and students
 
                     # The xmoduledescriptors included here are only the ones that have scores.
                     section_description = {
diff --git a/common/lib/xmodule/xmodule/tabs.py b/common/lib/xmodule/xmodule/tabs.py
index 2b271de1e3..a28432918a 100644
--- a/common/lib/xmodule/xmodule/tabs.py
+++ b/common/lib/xmodule/xmodule/tabs.py
@@ -377,7 +377,7 @@ class DiscussionTab(EnrolledOrStaffTab):
 
     def can_display(self, course, settings, is_user_authenticated, is_user_staff, is_user_enrolled):
         if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
-            from ccx.overrides import get_current_ccx
+            from ccx.overrides import get_current_ccx  # pylint: disable=import-error
             if get_current_ccx():
                 return False
         super_can_display = super(DiscussionTab, self).can_display(
@@ -752,11 +752,16 @@ class CcxCoachTab(CourseTab):
         )
 
     def can_display(self, course, settings, *args, **kw):
+        """
+        Since we don't get the user here, we use a thread local defined in the ccx
+        overrides to get it, then use the course to get the coach role and find out if
+        the user is one.
+        """
         user_is_coach = False
         if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
             from opaque_keys.edx.locations import SlashSeparatedCourseKey
-            from student.roles import CourseCcxCoachRole
-            from ccx.overrides import get_current_request
+            from student.roles import CourseCcxCoachRole  # pylint: disable=import-error
+            from ccx.overrides import get_current_request  # pylint: disable=import-error
             course_id = course.id.to_deprecated_string()
             course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
             role = CourseCcxCoachRole(course_key)
@@ -766,7 +771,7 @@ class CcxCoachTab(CourseTab):
         super_can_display = super(CcxCoachTab, self).can_display(
             course, settings, *args, **kw
         )
-        return (user_is_coach and super_can_display)
+        return user_is_coach and super_can_display
 
 
 class CourseTabList(List):
diff --git a/lms/djangoapps/ccx/__init__.py b/lms/djangoapps/ccx/__init__.py
index cf6e925092..3584f0006a 100644
--- a/lms/djangoapps/ccx/__init__.py
+++ b/lms/djangoapps/ccx/__init__.py
@@ -1 +1,4 @@
+"""
+we use this to mark the active ccx, for use by ccx middleware and some views
+"""
 ACTIVE_CCX_KEY = '_ccx_id'
diff --git a/lms/djangoapps/ccx/models.py b/lms/djangoapps/ccx/models.py
index 835c5403d4..048b63d9c2 100644
--- a/lms/djangoapps/ccx/models.py
+++ b/lms/djangoapps/ccx/models.py
@@ -1,8 +1,11 @@
+"""
+Models for the custom course feature
+"""
 from django.contrib.auth.models import User
 from django.db import models
 
-from student.models import CourseEnrollment, AlreadyEnrolledError
-from xmodule_django.models import CourseKeyField, LocationKeyField
+from student.models import CourseEnrollment, AlreadyEnrolledError  # pylint: disable=import-error
+from xmodule_django.models import CourseKeyField, LocationKeyField  # pylint: disable=import-error
 
 
 class CustomCourseForEdX(models.Model):
@@ -45,6 +48,9 @@ class CcxMembership(models.Model):
 
     @classmethod
     def memberships_for_user(cls, user, active=True):
+        """
+        active memberships for a user
+        """
         return cls.objects.filter(student=user, active__exact=active)
 
 
@@ -65,7 +71,7 @@ class CcxFieldOverride(models.Model):
     location = LocationKeyField(max_length=255, db_index=True)
     field = models.CharField(max_length=255)
 
-    class Meta:
+    class Meta:  # pylint: disable=missing-docstring,old-style-class
         unique_together = (('ccx', 'location', 'field'),)
 
     value = models.TextField(default='null')
diff --git a/lms/djangoapps/ccx/overrides.py b/lms/djangoapps/ccx/overrides.py
index aced5410f8..752de4bca6 100644
--- a/lms/djangoapps/ccx/overrides.py
+++ b/lms/djangoapps/ccx/overrides.py
@@ -1,6 +1,6 @@
 """
 API related to providing field overrides for individual students.  This is used
-by the individual due dates feature.
+by the individual custom courses feature.
 """
 import json
 import threading
@@ -9,8 +9,8 @@ from contextlib import contextmanager
 
 from django.db import transaction, IntegrityError
 
-from courseware.field_overrides import FieldOverrideProvider
-from ccx import ACTIVE_CCX_KEY
+from courseware.field_overrides import FieldOverrideProvider  # pylint: disable=import-error
+from ccx import ACTIVE_CCX_KEY  # pylint: disable=import-error
 
 from .models import CcxMembership, CcxFieldOverride
 
@@ -22,6 +22,9 @@ class CustomCoursesForEdxOverrideProvider(FieldOverrideProvider):
     overrides to be made on a per user basis.
     """
     def get(self, block, name, default):
+        """
+        Just call the get_override_for_ccx method if there is a ccx
+        """
         ccx = get_current_ccx()
         if ccx:
             return get_override_for_ccx(ccx, block, name, default)
@@ -58,15 +61,18 @@ def get_current_ccx():
     """
     Return the ccx that is active for this request.
     """
-    ccx = _CCX_CONTEXT.ccx
-    if ccx:
-        return ccx
+    return _CCX_CONTEXT.ccx
 
 
 def get_current_request():
+    """
+    Return the active request, so that we can get context information in places
+    where it is limited, like in the tabs.
+    """
     request = _CCX_CONTEXT.request
     return request
 
+
 def get_override_for_ccx(ccx, block, name, default=None):
     """
     Gets the value of the overridden field for the `ccx`.  `block` and `name`
@@ -74,11 +80,11 @@ def get_override_for_ccx(ccx, block, name, default=None):
     overridden for the given ccx, returns `default`.
     """
     if not hasattr(block, '_ccx_overrides'):
-        block._ccx_overrides = {}
-    overrides = block._ccx_overrides.get(ccx.id)
+        block._ccx_overrides = {}  # pylint: disable=protected-access
+    overrides = block._ccx_overrides.get(ccx.id)  # pylint: disable=protected-access
     if overrides is None:
         overrides = _get_overrides_for_ccx(ccx, block)
-        block._ccx_overrides[ccx.id] = overrides
+        block._ccx_overrides[ccx.id] = overrides  # pylint: disable=protected-access
     return overrides.get(name, default)
 
 
@@ -110,20 +116,20 @@ def override_field_for_ccx(ccx, block, name, value):
     value = json.dumps(field.to_json(value))
     try:
         override = CcxFieldOverride.objects.create(
-        ccx=ccx,
-        location=block.location,
-        field=name,
-        value=value)
+            ccx=ccx,
+            location=block.location,
+            field=name,
+            value=value)
     except IntegrityError:
         transaction.commit()
         override = CcxFieldOverride.objects.get(
-        ccx=ccx,
-        location=block.location,
-        field=name)
+            ccx=ccx,
+            location=block.location,
+            field=name)
         override.value = value
     override.save()
     if hasattr(block, '_ccx_overrides'):
-        del block._ccx_overrides[ccx.id]
+        del block._ccx_overrides[ccx.id]  # pylint: disable=protected-access
 
 
 def clear_override_for_ccx(ccx, block, name):
@@ -140,7 +146,7 @@ def clear_override_for_ccx(ccx, block, name):
             field=name).delete()
 
         if hasattr(block, '_ccx_overrides'):
-            del block._ccx_overrides[ccx.id]
+            del block._ccx_overrides[ccx.id]  # pylint: disable=protected-access
 
     except CcxFieldOverride.DoesNotExist:
         pass
@@ -169,7 +175,7 @@ class CcxMiddleware(object):
 
         _CCX_CONTEXT.request = request
 
-    def process_response(self, request, response):
+    def process_response(self, request, response):  # pylint: disable=unused-argument
         """
         Clean up afterwards.
         """
diff --git a/lms/djangoapps/ccx/tests/factories.py b/lms/djangoapps/ccx/tests/factories.py
index 694a547b1a..36c976970f 100644
--- a/lms/djangoapps/ccx/tests/factories.py
+++ b/lms/djangoapps/ccx/tests/factories.py
@@ -1,18 +1,22 @@
+"""
+Dummy factories for tests
+"""
 from factory.django import DjangoModelFactory
-from ccx.models import CustomCourseForEdX
-from ccx.models import CcxMembership
-from ccx.models import CcxFutureMembership
+from ccx.models import CustomCourseForEdX  # pylint: disable=import-error
+from ccx.models import CcxMembership  # pylint: disable=import-error
+from ccx.models import CcxFutureMembership  # pylint: disable=import-error
 
 
-class CcxFactory(DjangoModelFactory):
+class CcxFactory(DjangoModelFactory):  # pylint: disable=missing-docstring
     FACTORY_FOR = CustomCourseForEdX
     display_name = "Test CCX"
+    id = None  # pylint: disable=redefined-builtin, invalid-name
 
 
-class CcxMembershipFactory(DjangoModelFactory):
+class CcxMembershipFactory(DjangoModelFactory):  # pylint: disable=missing-docstring
     FACTORY_FOR = CcxMembership
     active = False
 
 
-class CcxFutureMembershipFactory(DjangoModelFactory):
+class CcxFutureMembershipFactory(DjangoModelFactory):  # pylint: disable=missing-docstring
     FACTORY_FOR = CcxFutureMembership
diff --git a/lms/djangoapps/ccx/tests/test_models.py b/lms/djangoapps/ccx/tests/test_models.py
index 9c164c1fc3..49689c4133 100644
--- a/lms/djangoapps/ccx/tests/test_models.py
+++ b/lms/djangoapps/ccx/tests/test_models.py
@@ -1,6 +1,9 @@
-from student.models import CourseEnrollment
-from student.roles import CourseCcxCoachRole
-from student.tests.factories import (
+"""
+tests for the models
+"""
+from student.models import CourseEnrollment  # pylint: disable=import-error
+from student.roles import CourseCcxCoachRole  # pylint: disable=import-error
+from student.tests.factories import (  # pylint: disable=import-error
     AdminFactory,
     CourseEnrollmentFactory,
     UserFactory,
@@ -10,7 +13,6 @@ from xmodule.modulestore.tests.factories import CourseFactory
 
 from .factories import (
     CcxFactory,
-    CcxMembershipFactory,
     CcxFutureMembershipFactory,
 )
 from ..models import (
@@ -36,6 +38,9 @@ class TestCcxMembership(ModuleStoreTestCase):
         self.unenrolled_user = UserFactory.create()
 
     def create_future_enrollment(self, user, auto_enroll=True):
+        """
+        utility method to create future enrollment
+        """
         pfm = CcxFutureMembershipFactory.create(
             ccx=self.ccx,
             email=user.email,
@@ -44,24 +49,36 @@ class TestCcxMembership(ModuleStoreTestCase):
         return pfm
 
     def has_course_enrollment(self, user):
+        """
+        utility method to create future enrollment
+        """
         enrollment = CourseEnrollment.objects.filter(
             user=user, course_id=self.course.id
         )
         return enrollment.exists()
 
     def has_ccx_membership(self, user):
+        """
+        verify ccx membership
+        """
         membership = CcxMembership.objects.filter(
             student=user, ccx=self.ccx, active=True
         )
         return membership.exists()
 
     def has_ccx_future_membership(self, user):
+        """
+        verify future ccx membership
+        """
         future_membership = CcxFutureMembership.objects.filter(
             email=user.email, ccx=self.ccx
         )
         return future_membership.exists()
 
-    def call_MUT(self, student, future_membership):
+    def call_mut(self, student, future_membership):
+        """
+        Call the method undser test
+        """
         CcxMembership.auto_enroll(student, future_membership)
 
     def test_ccx_auto_enroll_unregistered_user(self):
@@ -75,7 +92,7 @@ class TestCcxMembership(ModuleStoreTestCase):
         self.assertTrue(self.has_ccx_future_membership(user))
         self.assertFalse(self.has_course_enrollment(user))
         # auto_enroll user
-        self.call_MUT(user, pfm)
+        self.call_mut(user, pfm)
 
         self.assertTrue(self.has_course_enrollment(user))
         self.assertTrue(self.has_ccx_membership(user))
@@ -89,7 +106,7 @@ class TestCcxMembership(ModuleStoreTestCase):
         self.assertTrue(self.has_ccx_future_membership(user))
         self.assertTrue(self.has_course_enrollment(user))
 
-        self.call_MUT(user, pfm)
+        self.call_mut(user, pfm)
 
         self.assertTrue(self.has_course_enrollment(user))
         self.assertTrue(self.has_ccx_membership(user))
@@ -103,7 +120,7 @@ class TestCcxMembership(ModuleStoreTestCase):
         self.assertTrue(self.has_ccx_future_membership(user))
         self.assertFalse(self.has_course_enrollment(user))
 
-        self.assertRaises(ValueError, self.call_MUT, user, pfm)
+        self.assertRaises(ValueError, self.call_mut, user, pfm)
 
         self.assertFalse(self.has_course_enrollment(user))
         self.assertFalse(self.has_ccx_membership(user))
diff --git a/lms/djangoapps/ccx/tests/test_overrides.py b/lms/djangoapps/ccx/tests/test_overrides.py
index c3e624a769..f6edd44a43 100644
--- a/lms/djangoapps/ccx/tests/test_overrides.py
+++ b/lms/djangoapps/ccx/tests/test_overrides.py
@@ -1,10 +1,13 @@
+"""
+tests for overrides
+"""
 import datetime
 import mock
 import pytz
 
-from courseware.field_overrides import OverrideFieldData
+from courseware.field_overrides import OverrideFieldData  # pylint: disable=import-error
 from django.test.utils import override_settings
-from student.tests.factories import AdminFactory
+from student.tests.factories import AdminFactory  # pylint: disable=import-error
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 
@@ -13,6 +16,7 @@ from ..overrides import override_field_for_ccx
 
 from .test_views import flatten, iter_blocks
 
+
 @override_settings(FIELD_OVERRIDE_PROVIDERS=(
     'ccx.overrides.CustomCoursesForEdxOverrideProvider',))
 class TestFieldOverrides(ModuleStoreTestCase):
@@ -39,7 +43,7 @@ class TestFieldOverrides(ModuleStoreTestCase):
         verticals = flatten([
             [ItemFactory.create(due=due, parent=sequential) for _ in xrange(2)]
             for sequential in sequentials])
-        blocks = flatten([
+        blocks = flatten([  # pylint: disable=unused-variable
             [ItemFactory.create(parent=vertical) for _ in xrange(2)]
             for vertical in verticals])
 
@@ -59,12 +63,14 @@ class TestFieldOverrides(ModuleStoreTestCase):
         # just inject the override field storage in this brute force manner.
         OverrideFieldData.provider_classes = None
         for block in iter_blocks(course):
-            block._field_data = OverrideFieldData.wrap(  # pylint: disable=protected-access
-                AdminFactory.create(), block._field_data)  # pylint: disable=protected-access
+            block._field_data = OverrideFieldData.wrap(   # pylint: disable=protected-access
+                AdminFactory.create(), block._field_data)   # pylint: disable=protected-access
 
-        # and after everything is done, clean up by un-doing the change to the
-        # OverrideFieldData object that is done during the wrap method.
         def cleanup_provider_classes():
+            """
+            After everything is done, clean up by un-doing the change to the
+            OverrideFieldData object that is done during the wrap method.
+            """
             OverrideFieldData.provider_classes = None
         self.addCleanup(cleanup_provider_classes)
 
diff --git a/lms/djangoapps/ccx/tests/test_utils.py b/lms/djangoapps/ccx/tests/test_utils.py
index d9c21152f0..cd44efe458 100644
--- a/lms/djangoapps/ccx/tests/test_utils.py
+++ b/lms/djangoapps/ccx/tests/test_utils.py
@@ -1,14 +1,17 @@
-from ccx.models import (
+"""
+test utils
+"""
+from ccx.models import (  # pylint: disable=import-error
     CcxMembership,
     CcxFutureMembership,
 )
-from ccx.tests.factories import (
+from ccx.tests.factories import (  # pylint: disable=import-error
     CcxFactory,
     CcxMembershipFactory,
     CcxFutureMembershipFactory,
 )
-from student.roles import CourseCcxCoachRole
-from student.tests.factories import (
+from student.roles import CourseCcxCoachRole  # pylint: disable=import-error
+from student.tests.factories import (  # pylint: disable=import-error
     AdminFactory,
     UserFactory,
     CourseEnrollmentFactory,
@@ -53,7 +56,7 @@ class TestEmailEnrollmentState(ModuleStoreTestCase):
     def create_one(self, email=None):
         """Create a single EmailEnrollmentState object and return it
         """
-        from ccx.utils import EmailEnrollmentState
+        from ccx.utils import EmailEnrollmentState  # pylint: disable=import-error
         if email is None:
             email = self.user.email
         return EmailEnrollmentState(self.ccx, email)
@@ -138,17 +141,20 @@ class TestGetEmailParams(ModuleStoreTestCase):
         self.url_keys = [k for k in self.all_keys if 'url' in k]
         self.course_keys = [k for k in self.url_keys if 'course' in k]
 
-    def call_FUT(self, auto_enroll=False, secure=False):
-        from ccx.utils import get_email_params
+    def call_fut(self, auto_enroll=False, secure=False):
+        """
+        call function under test
+        """
+        from ccx.utils import get_email_params  # pylint: disable=import-error
         return get_email_params(self.ccx, auto_enroll, secure)
 
     def test_params_have_expected_keys(self):
-        params = self.call_FUT()
+        params = self.call_fut()
         self.assertFalse(set(params.keys()) - set(self.all_keys))
 
     def test_ccx_id_in_params(self):
         expected_course_id = self.ccx.course_id.to_deprecated_string()
-        params = self.call_FUT()
+        params = self.call_fut()
         self.assertEqual(params['course'], self.ccx)
         for url_key in self.url_keys:
             self.assertTrue('http://' in params[url_key])
@@ -156,17 +162,17 @@ class TestGetEmailParams(ModuleStoreTestCase):
             self.assertTrue(expected_course_id in params[url_key])
 
     def test_security_respected(self):
-        secure = self.call_FUT(secure=True)
+        secure = self.call_fut(secure=True)
         for url_key in self.url_keys:
             self.assertTrue('https://' in secure[url_key])
-        insecure = self.call_FUT(secure=False)
+        insecure = self.call_fut(secure=False)
         for url_key in self.url_keys:
             self.assertTrue('http://' in insecure[url_key])
 
     def test_auto_enroll_passed_correctly(self):
-        not_auto = self.call_FUT(auto_enroll=False)
+        not_auto = self.call_fut(auto_enroll=False)
         self.assertFalse(not_auto['auto_enroll'])
-        auto = self.call_FUT(auto_enroll=True)
+        auto = self.call_fut(auto_enroll=True)
         self.assertTrue(auto['auto_enroll'])
 
 
@@ -234,14 +240,15 @@ class TestEnrollEmail(ModuleStoreTestCase):
         self.assertEqual(member, state.member)
         self.assertEqual(user, state.user)
 
-    def call_FUT(
-        self,
-        student_email=None,
-        auto_enroll=False,
-        email_students=False,
-        email_params=None
+    def call_fut(
+            self,
+            student_email=None,
+            auto_enroll=False,
+            email_students=False,
+            email_params=None
     ):
-        from ccx.utils import enroll_email
+        """Call function under test"""
+        from ccx.utils import enroll_email  # pylint: disable=import-error
         if student_email is None:
             student_email = self.user.email
         before, after = enroll_email(
@@ -255,7 +262,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         # ensure no emails are in the outbox now
         self.assertEqual(self.outbox, [])
         test_email = "nobody@nowhere.com"
-        before, after = self.call_FUT(
+        before, after = self.call_fut(
             student_email=test_email, email_students=True
         )
 
@@ -274,7 +281,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         self.create_user()
         # ensure no emails are in the outbox now
         self.assertEqual(self.outbox, [])
-        before, after = self.call_FUT(email_students=True)
+        before, after = self.call_fut(email_students=True)
 
         # there should be a membership set for this email address now
         self.check_membership(email=self.user.email)
@@ -291,7 +298,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         self.register_user_in_ccx()
         # ensure no emails are in the outbox now
         self.assertEqual(self.outbox, [])
-        before, after = self.call_FUT(email_students=True)
+        before, after = self.call_fut(email_students=True)
 
         # there should be a membership set for this email address now
         self.check_membership(email=self.user.email)
@@ -308,7 +315,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         # ensure no emails are in the outbox now
         self.assertEqual(self.outbox, [])
         test_email = "nobody@nowhere.com"
-        before, after = self.call_FUT(
+        before, after = self.call_fut(
             student_email=test_email, email_students=False
         )
 
@@ -324,7 +331,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         self.create_user()
         # ensure no emails are in the outbox now
         self.assertEqual(self.outbox, [])
-        before, after = self.call_FUT(email_students=False)
+        before, after = self.call_fut(email_students=False)
 
         # there should be a membership set for this email address now
         self.check_membership(email=self.user.email)
@@ -339,7 +346,7 @@ class TestEnrollEmail(ModuleStoreTestCase):
         self.register_user_in_ccx()
         # ensure no emails are in the outbox now
         self.assertEqual(self.outbox, [])
-        before, after = self.call_FUT(email_students=False)
+        before, after = self.call_fut(email_students=False)
 
         # there should be a membership set for this email address now
         self.check_membership(email=self.user.email)
@@ -363,6 +370,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         role.add_users(coach)
         self.ccx = CcxFactory(course_id=course.id, coach=coach)
         self.outbox = self.get_outbox()
+        self.email = "nobody@nowhere.com"
 
     def get_outbox(self):
         """Return the django mail outbox"""
@@ -385,7 +393,6 @@ class TestUnenrollEmail(ModuleStoreTestCase):
 
     def make_ccx_future_membership(self):
         """create future registration for email in self.ccx"""
-        self.email = "nobody@nowhere.com"
         CcxFutureMembershipFactory.create(
             ccx=self.ccx, email=self.email
         )
@@ -402,6 +409,9 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.assertEqual(user, state.user)
 
     def check_membership(self, future=False):
+        """
+        check membership
+        """
         if future:
             membership = CcxFutureMembership.objects.filter(
                 ccx=self.ccx, email=self.email
@@ -412,8 +422,9 @@ class TestUnenrollEmail(ModuleStoreTestCase):
             )
         return membership.exists()
 
-    def call_FUT(self, email_students=False):
-        from ccx.utils import unenroll_email
+    def call_fut(self, email_students=False):
+        """call function under test"""
+        from ccx.utils import unenroll_email  # pylint: disable=import-error
         email = getattr(self, 'user', None) and self.user.email or self.email
         return unenroll_email(self.ccx, email, email_students=email_students)
 
@@ -425,7 +436,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.assertTrue(self.check_membership(future=True))
         self.assertEqual(self.outbox, [])
         # unenroll the student
-        before, after = self.call_FUT(email_students=True)
+        before, after = self.call_fut(email_students=True)
 
         # assert that membership is now gone
         self.assertFalse(self.check_membership(future=True))
@@ -444,7 +455,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.assertTrue(self.check_membership())
         self.assertEqual(self.outbox, [])
         # unenroll the student
-        before, after = self.call_FUT(email_students=True)
+        before, after = self.call_fut(email_students=True)
 
         # assert that membership is now gone
         self.assertFalse(self.check_membership())
@@ -464,7 +475,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.assertTrue(self.check_membership(future=True))
         self.assertEqual(self.outbox, [])
         # unenroll the student
-        before, after = self.call_FUT()
+        before, after = self.call_fut()
 
         # assert that membership is now gone
         self.assertFalse(self.check_membership(future=True))
@@ -482,7 +493,7 @@ class TestUnenrollEmail(ModuleStoreTestCase):
         self.assertTrue(self.check_membership())
         self.assertEqual(self.outbox, [])
         # unenroll the student
-        before, after = self.call_FUT()
+        before, after = self.call_fut()
 
         # assert that membership is now gone
         self.assertFalse(self.check_membership())
@@ -516,34 +527,36 @@ class TestUserCCXList(ModuleStoreTestCase):
         CcxMembershipFactory(ccx=self.ccx, student=self.user, active=active)
 
     def get_course_title(self):
-        from courseware.courses import get_course_about_section
+        """Get course title"""
+        from courseware.courses import get_course_about_section  # pylint: disable=import-error
         return get_course_about_section(self.course, 'title')
 
-    def call_FUT(self, user):
-        from ccx.utils import get_all_ccx_for_user
+    def call_fut(self, user):
+        """Call function under test"""
+        from ccx.utils import get_all_ccx_for_user  # pylint: disable=import-error
         return get_all_ccx_for_user(user)
 
     def test_anonymous_sees_no_ccx(self):
-        memberships = self.call_FUT(self.anonymous)
+        memberships = self.call_fut(self.anonymous)
         self.assertEqual(memberships, [])
 
     def test_unenrolled_sees_no_ccx(self):
-        memberships = self.call_FUT(self.user)
+        memberships = self.call_fut(self.user)
         self.assertEqual(memberships, [])
 
     def test_enrolled_inactive_sees_no_ccx(self):
         self.register_user_in_ccx()
-        memberships = self.call_FUT(self.user)
+        memberships = self.call_fut(self.user)
         self.assertEqual(memberships, [])
 
     def test_enrolled_sees_a_ccx(self):
         self.register_user_in_ccx(active=True)
-        memberships = self.call_FUT(self.user)
+        memberships = self.call_fut(self.user)
         self.assertEqual(len(memberships), 1)
 
     def test_data_structure(self):
         self.register_user_in_ccx(active=True)
-        memberships = self.call_FUT(self.user)
+        memberships = self.call_fut(self.user)
         this_membership = memberships[0]
         self.assertTrue(this_membership)
         # structure contains the expected keys
diff --git a/lms/djangoapps/ccx/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py
index 3f03288859..a86c681d36 100644
--- a/lms/djangoapps/ccx/tests/test_views.py
+++ b/lms/djangoapps/ccx/tests/test_views.py
@@ -1,3 +1,6 @@
+"""
+test views
+"""
 import datetime
 import json
 import re
@@ -5,14 +8,14 @@ import pytz
 from mock import patch
 
 from capa.tests.response_xml_factory import StringResponseXMLFactory
-from courseware.field_overrides import OverrideFieldData
-from courseware.tests.factories import StudentModuleFactory
-from courseware.tests.helpers import LoginEnrollmentTestCase
+from courseware.field_overrides import OverrideFieldData  # pylint: disable=import-error
+from courseware.tests.factories import StudentModuleFactory  # pylint: disable=import-error
+from courseware.tests.helpers import LoginEnrollmentTestCase  # pylint: disable=import-error
 from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
-from edxmako.shortcuts import render_to_response
-from student.roles import CourseCcxCoachRole
-from student.tests.factories import (
+from edxmako.shortcuts import render_to_response  # pylint: disable=import-error
+from student.roles import CourseCcxCoachRole  # pylint: disable=import-error
+from student.tests.factories import (  # pylint: disable=import-error
     AdminFactory,
     CourseEnrollmentFactory,
     UserFactory,
@@ -23,7 +26,6 @@ from xmodule.modulestore.tests.factories import (
     CourseFactory,
     ItemFactory,
 )
-from ccx import ACTIVE_CCX_KEY
 from ..models import (
     CustomCourseForEdX,
     CcxMembership,
@@ -75,29 +77,41 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         chapters = [ItemFactory.create(start=start, parent=course)
                     for _ in xrange(2)]
         sequentials = flatten([
-            [ItemFactory.create(parent=chapter) for _ in xrange(2)]
-            for chapter in chapters]
-        )
+            [
+                ItemFactory.create(parent=chapter) for _ in xrange(2)
+            ] for chapter in chapters
+        ])
         verticals = flatten([
-            [ItemFactory.create(
-                due=due, parent=sequential, graded=True, format='Homework')
-                for _ in xrange(2)]
-            for sequential in sequentials]
-        )
-        blocks = flatten([
-            [ItemFactory.create(parent=vertical) for _ in xrange(2)]
-            for vertical in verticals]
-        )
+            [
+                ItemFactory.create(
+                    due=due, parent=sequential, graded=True, format='Homework'
+                ) for _ in xrange(2)
+            ] for sequential in sequentials
+        ])
+        blocks = flatten([  # pylint: disable=unused-variable
+            [
+                ItemFactory.create(parent=vertical) for _ in xrange(2)
+            ] for vertical in verticals
+        ])
 
     def make_coach(self):
+        """
+        create coach user
+        """
         role = CourseCcxCoachRole(self.course.id)
         role.add_users(self.coach)
 
     def make_ccx(self):
+        """
+        create ccx
+        """
         ccx = CcxFactory(course_id=self.course.id, coach=self.coach)
         return ccx
 
     def get_outbox(self):
+        """
+        get fake outbox
+        """
         from django.core import mail
         return mail.outbox
 
@@ -142,7 +156,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
             kwargs={'course_id': self.course.id.to_deprecated_string()})
         response = self.client.post(url, {'name': 'New CCX'})
         self.assertEqual(response.status_code, 302)
-        url = response.get('location')
+        url = response.get('location')  # pylint: disable=no-member
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertTrue(re.search('id="ccx-schedule"', response.content))
@@ -159,7 +173,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
             'ccx_coach_dashboard',
             kwargs={'course_id': self.course.id.to_deprecated_string()})
         response = self.client.get(url)
-        schedule = json.loads(response.mako_context['schedule'])
+        schedule = json.loads(response.mako_context['schedule'])  # pylint: disable=no-member
         self.assertEqual(len(schedule), 2)
         self.assertEqual(schedule[0]['hidden'], True)
         self.assertEqual(schedule[0]['start'], None)
@@ -231,7 +245,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         data = {
             'enrollment-button': 'Enroll',
-            'student-ids': u','.join([student.email, ]),
+            'student-ids': u','.join([student.email, ]),  # pylint: disable=no-member
             'email-students': 'Notify-students-by-email',
         }
         response = self.client.post(url, data=data, follow=True)
@@ -240,7 +254,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(len(response.redirect_chain), 1)
         self.assertTrue(302 in response.redirect_chain[0])
         self.assertEqual(len(outbox), 1)
-        self.assertTrue(student.email in outbox[0].recipients())
+        self.assertTrue(student.email in outbox[0].recipients())  # pylint: disable=no-member
         # a CcxMembership exists for this student
         self.assertTrue(
             CcxMembership.objects.filter(ccx=ccx, student=student).exists()
@@ -264,7 +278,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         data = {
             'enrollment-button': 'Unenroll',
-            'student-ids': u','.join([student.email, ]),
+            'student-ids': u','.join([student.email, ]),  # pylint: disable=no-member
             'email-students': 'Notify-students-by-email',
         }
         response = self.client.post(url, data=data, follow=True)
@@ -273,7 +287,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertEqual(len(response.redirect_chain), 1)
         self.assertTrue(302 in response.redirect_chain[0])
         self.assertEqual(len(outbox), 1)
-        self.assertTrue(student.email in outbox[0].recipients())
+        self.assertTrue(student.email in outbox[0].recipients())  # pylint: disable=no-member
         # the membership for this student is gone
         self.assertFalse(
             CcxMembership.objects.filter(ccx=ccx, student=student).exists()
@@ -359,7 +373,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         data = {
             'student-action': 'add',
-            'student-id': u','.join([student.email, ]),
+            'student-id': u','.join([student.email, ]),  # pylint: disable=no-member
         }
         response = self.client.post(url, data=data, follow=True)
         self.assertEqual(response.status_code, 200)
@@ -390,7 +404,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         data = {
             'student-action': 'revoke',
-            'student-id': u','.join([student.email, ]),
+            'student-id': u','.join([student.email, ]),  # pylint: disable=no-member
         }
         response = self.client.post(url, data=data, follow=True)
         self.assertEqual(response.status_code, 200)
@@ -463,14 +477,16 @@ class TestCCXGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         # just inject the override field storage in this brute force manner.
         OverrideFieldData.provider_classes = None
         for block in iter_blocks(course):
-            block._field_data = OverrideFieldData.wrap(  # pylint: disable=protected-access
-                coach, block._field_data)  # pylint: disable=protected-access
-            block._field_data_cache = {}
+            block._field_data = OverrideFieldData.wrap(   # pylint: disable=protected-access
+                coach, block._field_data)   # pylint: disable=protected-access
+            block._field_data_cache = {}  # pylint: disable=protected-access
             visible_children(block)
 
-        # and after everything is done, clean up by un-doing the change to the
-        # OverrideFieldData object that is done during the wrap method.
         def cleanup_provider_classes():
+            """
+            After everything is done, clean up by un-doing the change to the
+            OverrideFieldData object that is done during the wrap method.
+            """
             OverrideFieldData.provider_classes = None
         self.addCleanup(cleanup_provider_classes)
 
@@ -500,7 +516,7 @@ class TestCCXGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        student_info = response.mako_context['students'][0]
+        student_info = response.mako_context['students'][0]  # pylint: disable=no-member
         self.assertEqual(student_info['grade_summary']['percent'], 0.5)
         self.assertEqual(
             student_info['grade_summary']['grade_breakdown'][0]['percent'],
@@ -535,7 +551,7 @@ class TestCCXGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
 
         self.client.login(username=self.student.username, password="test")
         session = self.client.session
-        session[ACTIVE_CCX_KEY] = self.ccx.id
+        session[ACTIVE_CCX_KEY] = self.ccx.id  # pylint: disable=no-member
         session.save()
         self.client.session.get(ACTIVE_CCX_KEY)
         url = reverse(
@@ -544,7 +560,7 @@ class TestCCXGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        grades = response.mako_context['grade_summary']
+        grades = response.mako_context['grade_summary']  # pylint: disable=no-member
         self.assertEqual(grades['percent'], 0.5)
         self.assertEqual(grades['grade_breakdown'][0]['percent'], 0.5)
         self.assertEqual(len(grades['section_breakdown']), 4)
@@ -574,13 +590,16 @@ class TestSwitchActiveCCX(ModuleStoreTestCase, LoginEnrollmentTestCase):
         CcxMembershipFactory(ccx=self.ccx, student=self.user, active=active)
 
     def revoke_ccx_registration(self):
-        from ..models import CcxMembership
+        """
+        delete membership
+        """
         membership = CcxMembership.objects.filter(
             ccx=self.ccx, student=self.user
         )
         membership.delete()
 
-    def verify_active_ccx(self, request, id=None):
+    def verify_active_ccx(self, request, id=None):  # pylint: disable=redefined-builtin, invalid-name
+        """verify that we have the correct active ccx"""
         if id:
             id = str(id)
         self.assertEqual(id, request.session.get(ACTIVE_CCX_KEY, None))
@@ -610,7 +629,7 @@ class TestSwitchActiveCCX(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))  # pylint: disable=no-member
         # if the ccx were active, we'd need to pass the ID of the ccx here.
         self.verify_active_ccx(self.client)
 
@@ -623,7 +642,7 @@ class TestSwitchActiveCCX(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))  # pylint: disable=no-member
         self.verify_active_ccx(self.client, self.ccx.id)
 
     def test_enrolled_user_can_select_mooc(self):
@@ -639,7 +658,7 @@ class TestSwitchActiveCCX(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))  # pylint: disable=no-member
         self.verify_active_ccx(self.client)
 
     def test_unenrolled_user_cannot_select_ccx(self):
@@ -650,7 +669,7 @@ class TestSwitchActiveCCX(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))  # pylint: disable=no-member
         # if the ccx were active, we'd need to pass the ID of the ccx here.
         self.verify_active_ccx(self.client)
 
@@ -666,7 +685,7 @@ class TestSwitchActiveCCX(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))  # pylint: disable=no-member
         # we tried to select the ccx but are not registered, so we are switched
         # back to the mooc view
         self.verify_active_ccx(self.client)
@@ -684,7 +703,7 @@ class TestSwitchActiveCCX(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response.get('Location', '').endswith(expected_url))
+        self.assertTrue(response.get('Location', '').endswith(expected_url))  # pylint: disable=no-member
         # the mooc should be active
         self.verify_active_ccx(self.client)
 
@@ -696,11 +715,11 @@ class TestSwitchActiveCCX(ModuleStoreTestCase, LoginEnrollmentTestCase):
             args=[self.course.id.to_deprecated_string(), self.ccx.id]
         )
         # delete the ccx
-        self.ccx.delete()
+        self.ccx.delete()  # pylint: disable=no-member
 
         response = self.client.get(switch_url)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response.get('Location', '').endswith(self.target_url))
+        self.assertTrue(response.get('Location', '').endswith(self.target_url))  # pylint: disable=no-member
         # we tried to select the ccx it doesn't exist anymore, so we are
         # switched back to the mooc view
         self.verify_active_ccx(self.client)
@@ -734,6 +753,7 @@ def iter_blocks(course):
     Returns an iterator over all of the blocks in a course.
     """
     def visit(block):
+        """ get child blocks """
         yield block
         for child in block.get_children():
             for descendant in visit(child):  # wish they'd backport yield from
@@ -742,12 +762,15 @@ def iter_blocks(course):
 
 
 def visible_children(block):
+    """
+    Return only visible children
+    """
     block_get_children = block.get_children
 
-    def get_children():
-        def iter_children():
+    def get_children():  # pylint: disable=missing-docstring
+        def iter_children():  # pylint: disable=missing-docstring
             for child in block_get_children():
-                child._field_data_cache = {}
+                child._field_data_cache = {}  # pylint: disable=protected-access
                 if not child.visible_to_staff_only:
                     yield child
         return list(iter_children())
diff --git a/lms/djangoapps/ccx/utils.py b/lms/djangoapps/ccx/utils.py
index 8dca532dd4..3ebf9e4d0b 100644
--- a/lms/djangoapps/ccx/utils.py
+++ b/lms/djangoapps/ccx/utils.py
@@ -4,14 +4,14 @@ CCX Enrollment operations for use by Coach APIs.
 Does not include any access control, be sure to check access before calling.
 """
 import logging
-from courseware.courses import get_course_about_section
-from courseware.courses import get_course_by_id
+from courseware.courses import get_course_about_section  # pylint: disable=import-error
+from courseware.courses import get_course_by_id  # pylint: disable=import-error
 from django.contrib.auth.models import User
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.mail import send_mail
-from edxmako.shortcuts import render_to_string
-from microsite_configuration import microsite
+from edxmako.shortcuts import render_to_string  # pylint: disable=import-error
+from microsite_configuration import microsite  # pylint: disable=import-error
 from xmodule.modulestore.django import modulestore
 from xmodule.error_module import ErrorDescriptor
 
@@ -44,7 +44,7 @@ class EmailEnrollmentState(object):
         self.in_ccx = in_ccx
 
     def __repr__(self):
-        return "{}(user={}, member={}, in_ccx={}".format(
+        return "{}(user={}, member={}, in_ccx={})".format(
             self.__class__.__name__,
             self.user,
             self.member,
@@ -52,6 +52,7 @@ class EmailEnrollmentState(object):
         )
 
     def to_dict(self):
+        """ return dict with membership and ccx info """
         return {
             'user': self.user,
             'member': self.member,
@@ -60,6 +61,9 @@ class EmailEnrollmentState(object):
 
 
 def enroll_email(ccx, student_email, auto_enroll=False, email_students=False, email_params=None):
+    """
+    Send email to newly enrolled student
+    """
     if email_params is None:
         email_params = get_email_params(ccx, True)
     previous_state = EmailEnrollmentState(ccx, student_email)
@@ -97,6 +101,9 @@ def enroll_email(ccx, student_email, auto_enroll=False, email_students=False, em
 
 
 def unenroll_email(ccx, student_email, email_students=False, email_params=None):
+    """
+    send email to unenrolled students
+    """
     if email_params is None:
         email_params = get_email_params(ccx, True)
     previous_state = EmailEnrollmentState(ccx, student_email)
@@ -112,8 +119,7 @@ def unenroll_email(ccx, student_email, email_students=False, email_params=None):
             send_mail_to_student(student_email, email_params)
     else:
         if CcxFutureMembership.objects.filter(
-            ccx=ccx, email=student_email
-        ).exists():
+                ccx=ccx, email=student_email).exists():
             CcxFutureMembership.objects.get(
                 ccx=ccx, email=student_email
             ).delete()
@@ -128,6 +134,9 @@ def unenroll_email(ccx, student_email, email_students=False, email_params=None):
 
 
 def get_email_params(ccx, auto_enroll, secure=True):
+    """
+    get parameters for enrollment emails
+    """
     protocol = 'https' if secure else 'http'
     course_id = ccx.course_id
 
@@ -172,6 +181,9 @@ def get_email_params(ccx, auto_enroll, secure=True):
 
 
 def send_mail_to_student(student, param_dict):
+    """
+    Check parameters, set text template and send email to student
+    """
     if 'course' in param_dict:
         param_dict['course_name'] = param_dict['course'].display_name
 
@@ -266,6 +278,7 @@ def get_all_ccx_for_user(user):
         })
     return memberships
 
+
 def get_ccx_membership_triplets(user, course_org_filter, org_filter_out_set):
     """
     Get the relevant set of (CustomCourseForEdX, CcxMembership, Course)
@@ -289,6 +302,6 @@ def get_ccx_membership_triplets(user, course_org_filter, org_filter_out_set):
 
                 yield (ccx, membership, course)
             else:
-                log.error("User {0} enrolled in {2} course {1}".format(
+                log.error("User {0} enrolled in {2} course {1}".format(  # pylint: disable=logging-format-interpolation
                     user.username, ccx.course_id, "broken" if course else "non-existent"
                 ))
diff --git a/lms/djangoapps/ccx/views.py b/lms/djangoapps/ccx/views.py
index a42018639f..339b21256f 100644
--- a/lms/djangoapps/ccx/views.py
+++ b/lms/djangoapps/ccx/views.py
@@ -22,22 +22,23 @@ from django.core.validators import validate_email
 from django.shortcuts import redirect
 from django.utils.translation import ugettext as _
 from django.views.decorators.cache import cache_control
-from django_future.csrf import ensure_csrf_cookie
+from django_future.csrf import ensure_csrf_cookie  # pylint: disable=import-error
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 
-from courseware.courses import get_course_by_id
-from courseware.field_overrides import disable_overrides
-from courseware.grades import iterate_grades_for
-from courseware.model_data import FieldDataCache
-from courseware.module_render import get_module_for_descriptor
-from edxmako.shortcuts import render_to_response
-from opaque_keys.edx.keys import CourseKey
-from student.roles import CourseCcxCoachRole
+from courseware.courses import get_course_by_id  # pylint: disable=import-error
 
-from instructor.offline_gradecalc import student_grades
-from instructor.views.api import _split_input_list
-from instructor.views.tools import get_student_from_identifier
+from courseware.field_overrides import disable_overrides  # pylint: disable=import-error
+from courseware.grades import iterate_grades_for  # pylint: disable=import-error
+from courseware.model_data import FieldDataCache  # pylint: disable=import-error
+from courseware.module_render import get_module_for_descriptor  # pylint: disable=import-error
+from edxmako.shortcuts import render_to_response  # pylint: disable=import-error
+from opaque_keys.edx.keys import CourseKey
+from student.roles import CourseCcxCoachRole  # pylint: disable=import-error
+
+from instructor.offline_gradecalc import student_grades  # pylint: disable=import-error
+from instructor.views.api import _split_input_list  # pylint: disable=import-error
+from instructor.views.tools import get_student_from_identifier  # pylint: disable=import-error
 
 from .models import CustomCourseForEdX, CcxMembership
 from .overrides import (
@@ -50,7 +51,7 @@ from .utils import (
     enroll_email,
     unenroll_email,
 )
-from ccx import ACTIVE_CCX_KEY
+from ccx import ACTIVE_CCX_KEY  # pylint: disable=import-error
 
 
 log = logging.getLogger(__name__)
@@ -181,7 +182,7 @@ def save_ccx(request, course):
                 clear_override_for_ccx(ccx, block, 'due')
 
             if not unit['hidden'] and block.graded:
-               graded[block.format] = graded.get(block.format, 0) + 1
+                graded[block.format] = graded.get(block.format, 0) + 1
 
             children = unit.get('children', None)
             if children:
@@ -232,7 +233,9 @@ def set_grading_policy(request, course):
 
 
 def validate_date(year, month, day, hour, minute):
-    # avoid corrupting db if bad dates come in
+    """
+    avoid corrupting db if bad dates come in
+    """
     valid = True
     if year < 0:
         valid = False
@@ -320,6 +323,9 @@ def get_ccx_schedule(course, ccx):
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @coach_dashboard
 def ccx_schedule(request, course):
+    """
+    get json representation of ccx schedule
+    """
     ccx = get_ccx_for_coach(course, request.user)
     schedule = get_ccx_schedule(course, ccx)
     json_schedule = json.dumps(schedule, indent=4)
@@ -512,7 +518,7 @@ def switch_active_ccx(request, course_id, ccx_id=None):
             requested_ccx = CustomCourseForEdX.objects.get(pk=ccx_id)
             assert unicode(requested_ccx.course_id) == course_id
             if not CcxMembership.objects.filter(
-                ccx=requested_ccx, student=request.user, active=True
+                    ccx=requested_ccx, student=request.user, active=True
             ).exists():
                 ccx_id = None
         except CustomCourseForEdX.DoesNotExist:
diff --git a/lms/djangoapps/courseware/field_overrides.py b/lms/djangoapps/courseware/field_overrides.py
index e7b0c8e121..7d58836024 100644
--- a/lms/djangoapps/courseware/field_overrides.py
+++ b/lms/djangoapps/courseware/field_overrides.py
@@ -20,7 +20,6 @@ from abc import ABCMeta, abstractmethod
 from contextlib import contextmanager
 from django.conf import settings
 from xblock.field_data import FieldData
-from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.inheritance import InheritanceMixin
 
 
diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index a17ff997ed..a1444be4c8 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -27,7 +27,6 @@ from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 
 
-
 log = logging.getLogger("edx.courseware")
 
 
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index 0b5e650677..43832bfaa7 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -20,7 +20,7 @@ from django.dispatch import receiver
 
 from model_utils.models import TimeStampedModel
 
-from xmodule_django.models import CourseKeyField, LocationKeyField, BlockTypeKeyField
+from xmodule_django.models import CourseKeyField, LocationKeyField, BlockTypeKeyField  # pylint: disable=import-error
 
 
 class StudentModule(models.Model):
@@ -37,8 +37,7 @@ class StudentModule(models.Model):
                     ('course', 'course'),
                     ('chapter', 'Section'),
                     ('sequential', 'Subsection'),
-                    ('library_content', 'Library Content'),
-                    )
+                    ('library_content', 'Library Content'))
     ## These three are the key for the object
     module_type = models.CharField(max_length=32, choices=MODULE_TYPES, default='problem', db_index=True)
 
@@ -88,7 +87,7 @@ class StudentModule(models.Model):
         return 'StudentModule<%r>' % ({
             'course_id': self.course_id,
             'module_type': self.module_type,
-            'student': self.student.username,
+            'student': self.student.username,  # pylint: disable=no-member
             'module_state_key': self.module_state_key,
             'state': str(self.state)[:20],
         },)
@@ -244,7 +243,7 @@ class StudentFieldOverride(TimeStampedModel):
     location = LocationKeyField(max_length=255, db_index=True)
     student = models.ForeignKey(User, db_index=True)
 
-    class Meta:   # pylint: disable=missing-docstring
+    class Meta(object):   # pylint: disable=missing-docstring
         unique_together = (('course_id', 'field', 'location', 'student'),)
 
     field = models.CharField(max_length=255)
diff --git a/lms/djangoapps/courseware/student_field_overrides.py b/lms/djangoapps/courseware/student_field_overrides.py
index 9b9134b2aa..afbc10ac79 100644
--- a/lms/djangoapps/courseware/student_field_overrides.py
+++ b/lms/djangoapps/courseware/student_field_overrides.py
@@ -25,11 +25,11 @@ def get_override_for_user(user, block, name, default=None):
     overridden for the given user, returns `default`.
     """
     if not hasattr(block, '_student_overrides'):
-        block._student_overrides = {}
-    overrides = block._student_overrides.get(user.id)
+        block._student_overrides = {}  # pylint: disable=protected-access
+    overrides = block._student_overrides.get(user.id)  # pylint: disable=protected-access
     if overrides is None:
         overrides = _get_overrides_for_user(user, block)
-        block._student_overrides[user.id] = overrides
+        block._student_overrides[user.id] = overrides  # pylint: disable=protected-access
     return overrides.get(name, default)
 
 
diff --git a/lms/djangoapps/courseware/tests/test_field_overrides.py b/lms/djangoapps/courseware/tests/test_field_overrides.py
index 4d0af91970..76cd636c91 100644
--- a/lms/djangoapps/courseware/tests/test_field_overrides.py
+++ b/lms/djangoapps/courseware/tests/test_field_overrides.py
@@ -26,6 +26,7 @@ class OverrideFieldDataTests(TestCase):
     """
 
     def setUp(self):
+        super(OverrideFieldDataTests, self).setUp()
         OverrideFieldData.provider_classes = None
 
     def tearDown(self):
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 1c43499bc7..628ed638ee 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -720,7 +720,7 @@ def modify_access(request, course_id):
     rolename = request.GET.get('rolename')
     action = request.GET.get('action')
 
-    if not rolename in ROLES:
+    if rolename not in ROLES:
         error = strip_tags("unknown rolename '{}'".format(rolename))
         log.error(error)
         return HttpResponseBadRequest(error)
@@ -783,7 +783,7 @@ def list_course_role_members(request, course_id):
 
     rolename = request.GET.get('rolename')
 
-    if not rolename in ROLES:
+    if rolename not in ROLES:
         return HttpResponseBadRequest()
 
     def extract_user_info(user):

From b315b4d7479f8711107ff1538ae4b9cf17e4acb3 Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Mon, 16 Mar 2015 02:00:17 -0600
Subject: [PATCH 27/29] MIT: CCX.  Fixes for issues identified in code review

Switch to font awesome icons, to fix issue with toggling collapsible sections of the schedule in ccx coach dashboard

Ensure access check takes place after descriptor is bound to the user, or field override checks will never happen
---
 lms/djangoapps/courseware/module_render.py |  6 ------
 lms/static/js/ccx/schedule.js              |  4 ++--
 lms/templates/ccx/schedule.html            |  2 +-
 lms/templates/ccx/schedule.underscore      | 12 ++++++------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 9e258988cb..7c1eeacff5 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -675,12 +675,6 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
         request_token (str): A unique token for this request, used to isolate xblock rendering
     """
 
-    # Do not check access when it's a noauth request.
-    if getattr(user, 'known', True):
-        # Short circuit--if the user shouldn't have access, bail without doing any work
-        if not has_access(user, 'load', descriptor, course_id):
-            return None
-
     (system, student_data) = get_module_system_for_user(
         user=user,
         field_data_cache=field_data_cache,  # These have implicit user bindings, the rest of args are considered not to
diff --git a/lms/static/js/ccx/schedule.js b/lms/static/js/ccx/schedule.js
index 9773669f49..ef51f79b63 100644
--- a/lms/static/js/ccx/schedule.js
+++ b/lms/static/js/ccx/schedule.js
@@ -292,13 +292,13 @@ var edx = edx || {};
 	    var children = self.get_children(row);
 
 	    if (row.is('.expanded')) {
-	      $(this).removeClass('icon-caret-down').addClass('icon-caret-right');
+	      $(this).removeClass('fa-caret-down').addClass('fa-caret-right');
 	      row.removeClass('expanded').addClass('collapsed');
 	      children.hide(); 
 	    }
 
 	    else {
-	      $(this).removeClass('icon-caret-right').addClass('icon-caret-down');
+	      $(this).removeClass('fa-caret-right').addClass('fa-caret-down');
 	      row.removeClass('collapsed').addClass('expanded');
 	      children.filter('.collapsed').each(function() {
 		children = children.not(self.get_children(this));
diff --git a/lms/templates/ccx/schedule.html b/lms/templates/ccx/schedule.html
index b9f6f6e6a5..22b6e67ff1 100644
--- a/lms/templates/ccx/schedule.html
+++ b/lms/templates/ccx/schedule.html
@@ -32,7 +32,7 @@
 <section id="enter-date-modal" class="modal" aria-hidden="true">
   <div class="inner-wrapper" role="dialog">
     <button class="close-modal">
-      <i class="icon-remove"></i>
+      <i class="fa-remove"></i>
       <span class="sr">
         ${_("Close")}
       </span>
diff --git a/lms/templates/ccx/schedule.underscore b/lms/templates/ccx/schedule.underscore
index 16dac641ba..4014d42866 100644
--- a/lms/templates/ccx/schedule.underscore
+++ b/lms/templates/ccx/schedule.underscore
@@ -5,7 +5,7 @@
         <th><%- gettext('Start Date') %></th>
         <th><%- gettext('Due Date') %></th>
         <th><a href="#" id="remove-all">
-          <i class="icon-remove-sign icon"></i> <%- gettext('remove all') %>
+          <i class="fa fa-remove"></i> <%- gettext('remove all') %>
         </a></th>
       </tr>
     </thead>
@@ -13,26 +13,26 @@
       <% _.each(chapters, function(chapter) { %>
         <tr class="chapter collapsed" data-location="<%= chapter.location %>" data-depth="1">
           <td class="unit">
-            <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a>
+            <a href="#"><i class="fa fa-caret-right toggle-collapse"></i></a>
             <%= chapter.display_name %>
           </td>
           <td class="date start-date"><a><%= chapter.start %></a></td>
           <td class="date due-date"><a><%= chapter.due %></a></td>
           <td><a href="#" class="remove-unit">
-            <i class="icon-remove-sign icon"></i> <%- gettext('remove') %>
+            <i class="fa fa-remove"></i> <%- gettext('remove') %>
           </a></td>
         </tr>
         <% _.each(chapter.children, function(child) { %>
           <tr class="sequential collapsed" data-depth="2"
               data-location="<%= chapter.location %> <%= child.location %>">
             <td class="unit">
-              <a href="#"><i class="icon-caret-right icon toggle-collapse"></i></a>
+              <a href="#"><i class="fa fa-caret-right toggle-collapse"></i></a>
               <%= child.display_name %>
             </td>
             <td class="date start-date"><a><%= child.start %></a></td>
             <td class="date due-date"><a><%= child.due %></a></td>
             <td><a href="#" class="remove-unit">
-              <i class="icon-remove-sign icon"></i> <%- gettext('remove') %>
+              <i class="fa fa-remove"></i> <%- gettext('remove') %>
             </a></td>
           </tr>
           <% _.each(child.children, function(subchild) { %>
@@ -42,7 +42,7 @@
               <td class="date start-date"><a><%= subchild.start %></a></td>
               <td class="date due-date"><a><%= subchild.due %></a></td>
               <td><a href="#" class="remove-unit">
-                <i class="icon-remove-sign icon"></i> <%- gettext('remove') %>
+                <i class="fa fa-remove"></i> <%- gettext('remove') %>
               </a></td>
           <% }); %>
         <% }); %>

From 8ba74429b166074fcf448a12843f560eea6d5782 Mon Sep 17 00:00:00 2001
From: cewing <cris@crisewing.com>
Date: Wed, 18 Mar 2015 23:56:01 -0700
Subject: [PATCH 28/29] MIT: CCX. Fixes for API changes that affect the binding
 of descriptors to student context.

fix for making sure all descriptor fields are always available for course descriptors despite module_class tricks

add required fields to cache data for tests

use a different strategy to mock up the get_children method
---
 common/lib/xmodule/xmodule/course_module.py | 10 ++++++-
 lms/djangoapps/ccx/tests/test_views.py      | 32 +++++++++------------
 lms/djangoapps/courseware/module_render.py  |  2 +-
 lms/djangoapps/instructor/tests/test_api.py |  1 -
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 0628743910..2bca5d3405 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -835,8 +835,16 @@ class CourseFields(object):
     )
 
 
+class CourseModule(CourseFields, SequenceModule):
+    """
+    The CourseDescriptor needs its module_class to be a SequenceModule, but some code that
+    expects a CourseDescriptor to have all its fields can fail if it gets a SequenceModule instead.
+    This class is to make sure that all the fields are present in all cases.
+    """
+
+
 class CourseDescriptor(CourseFields, SequenceDescriptor):
-    module_class = SequenceModule
+    module_class = CourseModule
 
     def __init__(self, *args, **kwargs):
         """
diff --git a/lms/djangoapps/ccx/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py
index a86c681d36..46a7d28dbb 100644
--- a/lms/djangoapps/ccx/tests/test_views.py
+++ b/lms/djangoapps/ccx/tests/test_views.py
@@ -21,6 +21,7 @@ from student.tests.factories import (  # pylint: disable=import-error
     UserFactory,
 )
 
+from xmodule.x_module import XModuleMixin
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import (
     CourseFactory,
@@ -418,8 +419,20 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
 
 
+original_get_children = XModuleMixin.get_children
+def patched_get_children(self, usage_key_filter=None):  # pylint: disable=missing-docstring
+    def iter_children():  # pylint: disable=missing-docstring
+        print self.__dict__
+        for child in original_get_children(self, usage_key_filter=usage_key_filter):
+            child._field_data_cache = {}  # pylint: disable=protected-access
+            if not child.visible_to_staff_only:
+                yield child
+    return list(iter_children())
+
+
 @override_settings(FIELD_OVERRIDE_PROVIDERS=(
     'ccx.overrides.CustomCoursesForEdxOverrideProvider',))
+@patch('xmodule.x_module.XModuleMixin.get_children', patched_get_children, spec=True)
 class TestCCXGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Tests for Custom Courses views.
@@ -479,8 +492,7 @@ class TestCCXGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         for block in iter_blocks(course):
             block._field_data = OverrideFieldData.wrap(   # pylint: disable=protected-access
                 coach, block._field_data)   # pylint: disable=protected-access
-            block._field_data_cache = {}  # pylint: disable=protected-access
-            visible_children(block)
+            block._field_data_cache = {'tabs':[],'discussion_topics':[]}  # pylint: disable=protected-access
 
         def cleanup_provider_classes():
             """
@@ -759,19 +771,3 @@ def iter_blocks(course):
             for descendant in visit(child):  # wish they'd backport yield from
                 yield descendant
     return visit(course)
-
-
-def visible_children(block):
-    """
-    Return only visible children
-    """
-    block_get_children = block.get_children
-
-    def get_children():  # pylint: disable=missing-docstring
-        def iter_children():  # pylint: disable=missing-docstring
-            for child in block_get_children():
-                child._field_data_cache = {}  # pylint: disable=protected-access
-                if not child.visible_to_staff_only:
-                    yield child
-        return list(iter_children())
-    block.get_children = get_children
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 7c1eeacff5..f7ac22e950 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -691,7 +691,7 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
     )
 
     authored_data = OverrideFieldData.wrap(user, descriptor._field_data)  # pylint: disable=protected-access
-    descriptor.bind_for_student(system, LmsFieldData(authored_data, field_data), user.id)
+    descriptor.bind_for_student(system, LmsFieldData(authored_data, student_data), user.id)
     descriptor.scope_ids = descriptor.scope_ids._replace(user_id=user.id)  # pylint: disable=protected-access
 
     # Do not check access when it's a noauth request.
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index d9a399e0bf..22333c0d15 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -3134,7 +3134,6 @@ def get_extended_due(course, unit, user):
         return None
 
 
-@override_settings(MODULESTORE=TEST_DATA_MOCK_MODULESTORE)
 class TestDueDateExtensions(ModuleStoreTestCase, LoginEnrollmentTestCase):
     """
     Test data dumps for reporting.

From f9351ef830f60b8192598b499304c434feaecb74 Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Mon, 30 Mar 2015 10:29:42 -0600
Subject: [PATCH 29/29] MIT: CCX. Code Quality Fixes

Remove duplicated course listings template code on the student dashboard.
---
 common/lib/xmodule/xmodule/course_module.py   |  2 +-
 lms/djangoapps/ccx/migrations/0001_initial.py |  5 +-
 lms/djangoapps/ccx/tests/test_views.py        |  9 ++-
 .../0011_add_model_StudentFieldOverride.py    |  6 +-
 ...erride_course_id_location_student__add_.py |  4 +-
 ...rride_created__add_field_studentfieldov.py |  4 +-
 .../courseware/tests/test_field_overrides.py  |  1 +
 lms/djangoapps/instructor/tests/test_tools.py |  7 +-
 lms/templates/dashboard.html                  | 64 ++-----------------
 9 files changed, 27 insertions(+), 75 deletions(-)

diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 2bca5d3405..e71fa5fdb8 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -835,7 +835,7 @@ class CourseFields(object):
     )
 
 
-class CourseModule(CourseFields, SequenceModule):
+class CourseModule(CourseFields, SequenceModule):  # pylint: disable=abstract-method
     """
     The CourseDescriptor needs its module_class to be a SequenceModule, but some code that
     expects a CourseDescriptor to have all its fields can fail if it gets a SequenceModule instead.
diff --git a/lms/djangoapps/ccx/migrations/0001_initial.py b/lms/djangoapps/ccx/migrations/0001_initial.py
index 80eb4a2cc4..6ec2fe67ce 100644
--- a/lms/djangoapps/ccx/migrations/0001_initial.py
+++ b/lms/djangoapps/ccx/migrations/0001_initial.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# pylint: disable=invalid-name, missing-docstring, unused-argument, unused-import, line-too-long
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
@@ -48,7 +49,6 @@ class Migration(SchemaMigration):
         # Adding unique constraint on 'CcxFieldOverride', fields ['ccx', 'location', 'field']
         db.create_unique('ccx_ccxfieldoverride', ['ccx_id', 'location', 'field'])
 
-
     def backwards(self, orm):
         # Removing unique constraint on 'CcxFieldOverride', fields ['ccx', 'location', 'field']
         db.delete_unique('ccx_ccxfieldoverride', ['ccx_id', 'location', 'field'])
@@ -65,7 +65,6 @@ class Migration(SchemaMigration):
         # Deleting model 'CcxFieldOverride'
         db.delete_table('ccx_ccxfieldoverride')
 
-
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -134,4 +133,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['ccx']
\ No newline at end of file
+    complete_apps = ['ccx']
diff --git a/lms/djangoapps/ccx/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py
index 46a7d28dbb..d321183375 100644
--- a/lms/djangoapps/ccx/tests/test_views.py
+++ b/lms/djangoapps/ccx/tests/test_views.py
@@ -120,6 +120,7 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         """
         Undo patches.
         """
+        super(TestCoachDashboard, self).tearDown()
         patch.stopall()
 
     def test_not_a_coach(self):
@@ -419,11 +420,13 @@ class TestCoachDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
         )
 
 
-original_get_children = XModuleMixin.get_children
+GET_CHILDREN = XModuleMixin.get_children
+
+
 def patched_get_children(self, usage_key_filter=None):  # pylint: disable=missing-docstring
     def iter_children():  # pylint: disable=missing-docstring
         print self.__dict__
-        for child in original_get_children(self, usage_key_filter=usage_key_filter):
+        for child in GET_CHILDREN(self, usage_key_filter=usage_key_filter):
             child._field_data_cache = {}  # pylint: disable=protected-access
             if not child.visible_to_staff_only:
                 yield child
@@ -492,7 +495,7 @@ class TestCCXGrades(ModuleStoreTestCase, LoginEnrollmentTestCase):
         for block in iter_blocks(course):
             block._field_data = OverrideFieldData.wrap(   # pylint: disable=protected-access
                 coach, block._field_data)   # pylint: disable=protected-access
-            block._field_data_cache = {'tabs':[],'discussion_topics':[]}  # pylint: disable=protected-access
+            block._field_data_cache = {'tabs': [], 'discussion_topics': []}  # pylint: disable=protected-access
 
         def cleanup_provider_classes():
             """
diff --git a/lms/djangoapps/courseware/migrations/0011_add_model_StudentFieldOverride.py b/lms/djangoapps/courseware/migrations/0011_add_model_StudentFieldOverride.py
index d8f5caadd6..22bc4ae689 100644
--- a/lms/djangoapps/courseware/migrations/0011_add_model_StudentFieldOverride.py
+++ b/lms/djangoapps/courseware/migrations/0011_add_model_StudentFieldOverride.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# pylint: disable=invalid-name, missing-docstring, unused-argument, unused-import, line-too-long
+
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
@@ -19,12 +21,10 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal('courseware', ['StudentFieldOverride'])
 
-
     def backwards(self, orm):
         # Deleting model 'StudentFieldOverride'
         db.delete_table('courseware_studentfieldoverride')
 
-
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -142,4 +142,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['courseware']
\ No newline at end of file
+    complete_apps = ['courseware']
diff --git a/lms/djangoapps/courseware/migrations/0012_auto__del_unique_studentfieldoverride_course_id_location_student__add_.py b/lms/djangoapps/courseware/migrations/0012_auto__del_unique_studentfieldoverride_course_id_location_student__add_.py
index d79f119a24..3809138373 100644
--- a/lms/djangoapps/courseware/migrations/0012_auto__del_unique_studentfieldoverride_course_id_location_student__add_.py
+++ b/lms/djangoapps/courseware/migrations/0012_auto__del_unique_studentfieldoverride_course_id_location_student__add_.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# pylint: disable=invalid-name, missing-docstring, unused-argument, unused-import, line-too-long
+
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
@@ -12,12 +14,10 @@ class Migration(SchemaMigration):
         # Adding unique constraint on 'StudentFieldOverride', fields ['course_id', 'field', 'location', 'student']
         db.create_unique('courseware_studentfieldoverride', ['course_id', 'field', 'location', 'student_id'])
 
-
     def backwards(self, orm):
         # Removing unique constraint on 'StudentFieldOverride', fields ['course_id', 'field', 'location', 'student']
         db.delete_unique('courseware_studentfieldoverride', ['course_id', 'field', 'location', 'student_id'])
 
-
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},
diff --git a/lms/djangoapps/courseware/migrations/0013_auto__add_field_studentfieldoverride_created__add_field_studentfieldov.py b/lms/djangoapps/courseware/migrations/0013_auto__add_field_studentfieldoverride_created__add_field_studentfieldov.py
index bd67226137..28b82c8425 100644
--- a/lms/djangoapps/courseware/migrations/0013_auto__add_field_studentfieldoverride_created__add_field_studentfieldov.py
+++ b/lms/djangoapps/courseware/migrations/0013_auto__add_field_studentfieldoverride_created__add_field_studentfieldov.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# pylint: disable=invalid-name, missing-docstring, unused-argument, unused-import, line-too-long
+
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
@@ -21,7 +23,6 @@ class Migration(SchemaMigration):
         # Adding index on 'StudentFieldOverride', fields ['course_id', 'location', 'student']
         db.create_index('courseware_studentfieldoverride', ['course_id', 'location', 'student_id'])
 
-
     def backwards(self, orm):
         # Deleting field 'StudentFieldOverride.created'
         db.delete_column('courseware_studentfieldoverride', 'created')
@@ -32,7 +33,6 @@ class Migration(SchemaMigration):
         # Removing index on 'StudentFieldOverride', fields ['course_id', 'location', 'student']
         db.delete_index('courseware_studentfieldoverride', ['course_id', 'location', 'student_id'])
 
-
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},
diff --git a/lms/djangoapps/courseware/tests/test_field_overrides.py b/lms/djangoapps/courseware/tests/test_field_overrides.py
index 76cd636c91..1504be6d48 100644
--- a/lms/djangoapps/courseware/tests/test_field_overrides.py
+++ b/lms/djangoapps/courseware/tests/test_field_overrides.py
@@ -30,6 +30,7 @@ class OverrideFieldDataTests(TestCase):
         OverrideFieldData.provider_classes = None
 
     def tearDown(self):
+        super(OverrideFieldDataTests, self).tearDown()
         OverrideFieldData.provider_classes = None
 
     def make_one(self):
diff --git a/lms/djangoapps/instructor/tests/test_tools.py b/lms/djangoapps/instructor/tests/test_tools.py
index 7be040a674..17a08c72ed 100644
--- a/lms/djangoapps/instructor/tests/test_tools.py
+++ b/lms/djangoapps/instructor/tests/test_tools.py
@@ -10,9 +10,8 @@ import unittest
 from django.utils.timezone import utc
 from django.test.utils import override_settings
 
-from courseware.models import StudentModule
-from courseware.field_overrides import OverrideFieldData
-from student.tests.factories import UserFactory
+from courseware.field_overrides import OverrideFieldData  # pylint: disable=import-error
+from student.tests.factories import UserFactory  # pylint: disable=import-error
 from xmodule.fields import Date
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
@@ -222,6 +221,7 @@ class TestSetDueDateExtension(ModuleStoreTestCase):
                 user, block._field_data)  # pylint: disable=protected-access
 
     def tearDown(self):
+        super(TestSetDueDateExtension, self).tearDown()
         OverrideFieldData.provider_classes = None
 
     def _clear_field_data_cache(self):
@@ -280,7 +280,6 @@ class TestDataDumps(ModuleStoreTestCase):
         course = CourseFactory.create()
         week1 = ItemFactory.create(due=due, parent=course)
         week2 = ItemFactory.create(due=due, parent=course)
-        week3 = ItemFactory.create(due=due, parent=course)
 
         homework = ItemFactory.create(
             parent=week1,
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 28a743f0ff..30fd076816 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -94,6 +94,13 @@
         <% course_requirements = courses_requirements_not_met.get(course.id) %>
         <%include file='dashboard/_dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, show_refund_option = show_refund_option, is_paid_course = is_paid_course, is_course_blocked = is_course_blocked, verification_status=course_verification_status, course_requirements=course_requirements, dashboard_index=dashboard_index, share_settings=share_settings" />
       % endfor
+
+      % if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
+        % for ccx, membership, course in ccx_membership_triplets:
+            <%include file='ccx/_dashboard_ccx_listing.html' args="ccx=ccx, membership=membership, course=course" />
+        % endfor
+      % endif
+
       </ul>
     % else:
       <section class="empty-dashboard-message">
@@ -222,63 +229,6 @@
       </ul>
     </section>
   </section>
-
-  <section id="my-courses" class="my-courses" role="main" aria-label="Content">
-    <header>
-      <h2>${_("Current Courses")}</h2>
-    </header>
-
-    % if len(course_enrollment_pairs) > 0:
-      <ul class="listing-courses">
-        % for course, enrollment in course_enrollment_pairs:
-            <% show_courseware_link = (course.id in show_courseware_links_for) %>
-            <% cert_status = cert_statuses.get(course.id) %>
-            <% show_email_settings = (course.id in show_email_settings_for) %>
-            <% course_mode_info = all_course_modes.get(course.id) %>
-            <% show_refund_option = (course.id in show_refund_option_for) %>
-            <% is_paid_course = (course.id in enrolled_courses_either_paid) %>
-            <% is_course_blocked = (course.id in block_courses) %>
-            <% course_verification_status = verification_status_by_course.get(course.id, {}) %>
-            <% course_requirements = courses_requirements_not_met.get(course.id) %>
-            <%include file='dashboard/_dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, show_refund_option = show_refund_option, is_paid_course = is_paid_course, is_course_blocked = is_course_blocked, verification_status=course_verification_status, course_requirements=course_requirements" />
-      % endfor
-
-      % if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
-        % for ccx, membership, course in ccx_membership_triplets:
-            <%include file='ccx/_dashboard_ccx_listing.html' args="ccx=ccx, membership=membership, course=course" />
-        % endfor
-      % endif
-
-      </ul>
-    % else:
-      <section class="empty-dashboard-message">
-        % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
-          <p>${_("Looks like you haven't enrolled in any courses yet.")}</p>
-          <a href="${marketing_link('COURSES')}">
-            ${_("Find courses now!")}
-          </a>
-        % else:
-          <p>${_("Looks like you haven't enrolled in any courses yet.")}</p>
-        %endif
-      </section>
-    % endif
-
-    % if staff_access and len(errored_courses) > 0:
-      <div id="course-errors">
-        <h2>${_("Course-loading errors")}</h2>
-
-      % for course_dir, errors in errored_courses.items():
-         <h3>${course_dir | h}</h3>
-             <ul>
-           % for (msg, err) in errors:
-               <li>${msg}
-                 <ul><li><pre>${err}</pre></li></ul>
-               </li>
-           % endfor
-             </ul>
-      % endfor
-    % endif
-  </section>
 </section>
 
 <section id="email-settings-modal" class="modal" aria-hidden="true">