<%- interpolate(
- gettext('If you select an option other than "%(hide_label)s", after the subsection release date has passed, published units in this subsection will become available to learners unless units are explicitly hidden.'),
+ gettext('If you select an option other than "%(hide_label)s", published units in this subsection become available to learners unless they are explicitly hidden.'),
{ hide_label: hide_label },
true
) %>
diff --git a/cms/templates/js/course-outline.underscore b/cms/templates/js/course-outline.underscore
index 383176314c..4e1418a658 100644
--- a/cms/templates/js/course-outline.underscore
+++ b/cms/templates/js/course-outline.underscore
@@ -201,7 +201,12 @@ if (is_proctored_exam) {
<% if (xblockInfo.get('hide_after_due')) { %>
- <%- gettext("Subsection is hidden after due date") %>
+
+ <% if (course.get('self_paced')) { %>
+ <%- gettext("Subsection is hidden after course end date") %>
+ <% } else { %>
+ <%- gettext("Subsection is hidden after due date") %>
+ <% } %>
<% } %>
diff --git a/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
index 545d7c8c29..4ca8d5585b 100644
--- a/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee
@@ -236,56 +236,26 @@ describe 'Problem', ->
expect(@problem.el).toHaveHtml contents
expect(window.SR.readTexts).toHaveBeenCalledWith ['no, try again']
- it 'tests if all the capa buttons are disabled while submitting', (done)->
- deferred = $.Deferred()
+ it 'tests if the submit button is disabled while submitting and the text changes on the button', ->
self = this
-
- runs = ->
- spyOn($, 'postWithPrefix').and.callFake (url, answers, callback) ->
- promise = undefined
- callback
- success: 'incorrect'
- contents: 'Incorrect'
- promise =
- always: (callable) ->
- callable()
- done: (callable) ->
- callable()
- spyOn @problem, 'enableAllButtons'
- @problem.submit()
- expect(@problem.enableAllButtons).toHaveBeenCalledWith false, true
- if jQuery.active == 0
- deferred.resolve()
- deferred.promise()
-
- runs.call(self).then(->
- expect(self.problem.enableAllButtons).toHaveBeenCalledWith true, true
- return
- ).always done
-
- it 'tests the expected change in text of submit button', (done) ->
- deferred = $.Deferred()
- self = this
-
- runs = ->
- spyOn($, 'postWithPrefix').and.callFake (url, answers, callback) ->
- promise = undefined
- promise =
- always: (callable) ->
- callable()
- done: (callable) ->
- callable()
- spyOn @problem.submitButtonLabel, 'text'
- @problem.submit()
- expect(@problem.submitButtonLabel.text).toHaveBeenCalledWith 'Submitting'
- if jQuery.active == 0
- deferred.resolve()
- deferred.promise()
-
- runs.call(self).then(->
- expect(self.problem.submitButtonLabel.text).toHaveBeenCalledWith 'Submit'
- return
- ).always done
+ curr_html = @problem.el.html()
+ spyOn($, 'postWithPrefix').and.callFake (url, answers, callback) ->
+ # At this point enableButtons should have been called, making the submit button disabled with text 'submitting'
+ expect(self.problem.submitButton).toHaveAttr('disabled');
+ expect(self.problem.submitButtonLabel.text()).toBe('Submitting');
+ callback
+ success: 'incorrect' # does not matter if correct or incorrect here
+ contents: curr_html
+ promise =
+ always: (callable) -> callable()
+ done: (callable) -> callable()
+ # Make sure the submit button is enabled before submitting
+ $('#input_example_1').val('test').trigger('input')
+ expect(@problem.submitButton).not.toHaveAttr('disabled')
+ @problem.submit()
+ # After submit, the button should not be disabled and should have text as 'Submit'
+ expect(@problem.submitButtonLabel.text()).toBe('Submit')
+ expect(@problem.submitButton).not.toHaveAttr('disabled')
describe 'submit button on problems', ->
beforeEach ->
@@ -424,27 +394,22 @@ describe 'Problem', ->
@problem.reset()
expect($('.notification-gentle-alert .notification-message').text()).toEqual("Error on reset.")
- it 'tests if all the buttons are disabled and the text of submit button remains same while resetting', (done) ->
- deferred = $.Deferred()
+ it 'tests that reset does not enable submit or modify the text while resetting', ->
self = this
-
- runs = ->
- spyOn($, 'postWithPrefix').and.callFake (url, answers, callback) ->
- promise = undefined
- promise = always: (callable) ->
- callable()
- spyOn @problem, 'enableAllButtons'
- @problem.reset()
- expect(@problem.enableAllButtons).toHaveBeenCalledWith false, false
- expect(@problem.submitButtonLabel).toHaveText 'Submit'
- if jQuery.active == 0
- deferred.resolve()
- deferred.promise()
-
- runs.call(self).then(->
- expect(self.problem.enableAllButtons).toHaveBeenCalledWith true, false
- expect(self.problem.submitButtonLabel).toHaveText 'Submit'
- ).always done
+ curr_html = @problem.el.html()
+ spyOn($, 'postWithPrefix').and.callFake (url, answers, callback) ->
+ # enableButtons should have been called at this point to set them to all disabled
+ expect(self.problem.submitButton).toHaveAttr('disabled')
+ expect(self.problem.submitButtonLabel.text()).toBe('Submit')
+ callback(success: 'correct', html: curr_html)
+ promise =
+ always: (callable) -> callable()
+ # Submit should be disabled
+ expect(@problem.submitButton).toHaveAttr('disabled')
+ @problem.reset()
+ # Submit should remain disabled
+ expect(self.problem.submitButton).toHaveAttr('disabled')
+ expect(self.problem.submitButtonLabel.text()).toBe('Submit')
describe 'show', ->
beforeEach ->
@@ -483,22 +448,14 @@ describe 'Problem', ->
@problem.show()
expect(@problem.el.find('.show').attr('disabled')).toEqual('disabled')
- it 'sends a SR message when answer is present', (done) ->
- deferred = $.Deferred()
+ it 'sends a SR message when answer is present', ->
- runs = ->
- spyOn($, 'postWithPrefix').and.callFake (url, callback) ->
- callback answers:
- '1_1': 'answers'
- @problem.show()
- if jQuery.active == 0
- deferred.resolve()
- deferred.promise()
+ spyOn($, 'postWithPrefix').and.callFake (url, callback) ->
+ callback answers:
+ '1_1': 'answers'
+ @problem.show()
- runs.call(this).then(->
- expect(window.SR.readText).toHaveBeenCalledWith 'Answers to this problem are now shown. Navigate through the problem to review it with answers inline.'
- return
- ).always done
+ expect(window.SR.readText).toHaveBeenCalledWith 'Answers to this problem are now shown. Navigate through the problem to review it with answers inline.'
describe 'multiple choice question', ->
beforeEach ->
@@ -723,28 +680,42 @@ describe 'Problem', ->
expect($.postWithPrefix).toHaveBeenCalledWith '/problem/Problem1/problem_save',
'foo=1&bar=2', jasmine.any(Function)
- it 'tests if all the buttons are disabled and the text of submit button does not change while saving.', (done) ->
- deferred = $.Deferred()
+ it 'tests that save does not enable the submit button or change the text when submit is originally disabled', ->
self = this
curr_html = @problem.el.html()
- runs = ->
- spyOn($, 'postWithPrefix').and.callFake (url, answers, callback) ->
- promise = undefined
- callback(success: 'correct', html: curr_html)
- promise = always: (callable) ->
- callable()
- spyOn @problem, 'enableAllButtons'
- @problem.save()
- expect(@problem.enableAllButtons).toHaveBeenCalledWith false, false
- expect(@problem.submitButtonLabel).toHaveText 'Submit'
- if jQuery.active == 0
- deferred.resolve()
- deferred.promise()
+ spyOn($, 'postWithPrefix').and.callFake (url, answers, callback) ->
+ # enableButtons should have been called at this point and the submit button should be unaffected
+ expect(self.problem.submitButton).toHaveAttr('disabled')
+ expect(self.problem.submitButtonLabel.text()).toBe('Submit')
+ callback(success: 'correct', html: curr_html)
+ promise =
+ always: (callable) -> callable()
+ # Expect submit to be disabled and labeled properly at the start
+ expect(@problem.submitButton).toHaveAttr('disabled')
+ expect(@problem.submitButtonLabel.text()).toBe('Submit')
+ @problem.save()
+ # Submit button should have the same state after save has completed
+ expect(@problem.submitButton).toHaveAttr('disabled')
+ expect(@problem.submitButtonLabel.text()).toBe('Submit')
- runs.call(self).then(->
- expect(self.problem.enableAllButtons).toHaveBeenCalledWith true, false
- expect(self.problem.submitButtonLabel).toHaveText 'Submit'
- ).always done
+ it 'tests that save does not disable the submit button or change the text when submit is originally enabled', ->
+ self = this
+ curr_html = @problem.el.html()
+ spyOn($, 'postWithPrefix').and.callFake (url, answers, callback) ->
+ # enableButtons should have been called at this point, and the submit button should be disabled while submitting
+ expect(self.problem.submitButton).toHaveAttr('disabled')
+ expect(self.problem.submitButtonLabel.text()).toBe('Submit')
+ callback(success: 'correct', html: curr_html)
+ promise =
+ always: (callable) -> callable()
+ # Expect submit to be enabled and labeled properly at the start after adding an input
+ $('#input_example_1').val('test').trigger('input')
+ expect(@problem.submitButton).not.toHaveAttr('disabled')
+ expect(@problem.submitButtonLabel.text()).toBe('Submit')
+ @problem.save()
+ # Submit button should have the same state after save has completed
+ expect(@problem.submitButton).not.toHaveAttr('disabled')
+ expect(@problem.submitButtonLabel.text()).toBe('Submit')
describe 'refreshMath', ->
beforeEach ->
diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.js b/common/lib/xmodule/xmodule/js/src/capa/display.js
index ab51436107..19aab27fa9 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.js
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.js
@@ -36,9 +36,6 @@
}
return Problem.prototype.enableSubmitButton.apply(that, arguments);
};
- this.enableAllButtons = function(enable, isFromCheckOperation) { // eslint-disable-line no-unused-vars
- return Problem.prototype.enableAllButtons.apply(that, arguments);
- };
this.disableAllButtonsWhileRunning = function(
operationCallback, isFromCheckOperation // eslint-disable-line no-unused-vars
) {
@@ -1157,32 +1154,38 @@
*/
Problem.prototype.disableAllButtonsWhileRunning = function(operationCallback, isFromCheckOperation) {
var that = this;
- this.enableAllButtons(false, isFromCheckOperation);
+ var allButtons = [this.resetButton, this.saveButton, this.showButton, this.hintButton, this.submitButton];
+ var initiallyEnabledButtons = allButtons.filter(function(button) {
+ return !button.attr('disabled');
+ });
+ this.enableButtons(initiallyEnabledButtons, false, isFromCheckOperation);
return operationCallback().always(function() {
- return that.enableAllButtons(true, isFromCheckOperation);
+ return that.enableButtons(initiallyEnabledButtons, true, isFromCheckOperation);
});
};
/**
- * Used to enable/disable all buttons in problem.
+ * Enables/disables buttons by removing/adding the disabled attribute. The submit button is checked
+ * separately due to the changing text it contains.
*
* params:
- * 'enable' is a boolean to determine enabling/disabling of buttons.
- * 'isFromCheckOperation' is a boolean to keep track if operation was initiated
+ * 'buttons' is an array of buttons that will have their 'disabled' attribute modified
+ * 'enable' a boolean to either enable or disable the buttons passed in the first parameter
+ * 'changeSubmitButtonText' is a boolean to keep track if operation was initiated
* from submit so that text of submit button will also be changed while disabling/enabling
* the submit button.
*/
- Problem.prototype.enableAllButtons = function(enable, isFromCheckOperation) {
- // Called by disableAllButtonsWhileRunning to automatically disable all buttons while check,reset, or
- // save internal are running. Then enable all the buttons again after it is done.
- if (enable) {
- this.resetButton.add(this.saveButton).add(this.hintButton).add(this.showButton).
- removeAttr('disabled');
- } else {
- this.resetButton.add(this.saveButton).add(this.hintButton).add(this.showButton).
- attr({disabled: 'disabled'});
- }
- return this.enableSubmitButton(enable, isFromCheckOperation);
+ Problem.prototype.enableButtons = function(buttons, enable, changeSubmitButtonText) {
+ var that = this;
+ buttons.forEach(function(button) {
+ if (button.hasClass('submit')) {
+ that.enableSubmitButton(enable, changeSubmitButtonText);
+ } else if (enable) {
+ button.removeAttr('disabled');
+ } else {
+ button.attr({disabled: 'disabled'});
+ }
+ });
};
/**
diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py
index ca588eee33..8233f2a669 100644
--- a/common/lib/xmodule/xmodule/seq_module.py
+++ b/common/lib/xmodule/xmodule/seq_module.py
@@ -202,16 +202,16 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
raise NotFoundError('Unexpected dispatch type')
@classmethod
- def verify_current_content_visibility(cls, due, hide_after_due):
+ def verify_current_content_visibility(cls, date, hide_after_date):
"""
Returns whether the content visibility policy passes
- for the given due date and hide_after_due values and
+ for the given date and hide_after_date values and
the current date-time.
"""
return (
- not due or
- not hide_after_due or
- datetime.now(UTC()) < due
+ not date or
+ not hide_after_date or
+ datetime.now(UTC()) < date
)
def student_view(self, context):
@@ -246,20 +246,17 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
runtime user. If so, returns a banner_text or the fragment to
display depending on whether staff is masquerading.
"""
- if not self._can_user_view_content():
- subsection_format = (self.format or _("subsection")).lower() # pylint: disable=no-member
-
- # Translators: subsection_format refers to the assignment
- # type of the subsection, such as Homework, Lab, Exam, etc.
- banner_text = _(
- "Because the due date has passed, "
- "this {subsection_format} is hidden from the learner."
- ).format(subsection_format=subsection_format)
+ course = self._get_course()
+ if not self._can_user_view_content(course):
+ if course.self_paced:
+ banner_text = _("Because the course has ended, this assignment is hidden from the learner.")
+ else:
+ banner_text = _("Because the due date has passed, this assignment is hidden from the learner.")
hidden_content_html = self.system.render_template(
'hidden_content.html',
{
- 'subsection_format': subsection_format,
+ 'self_paced': course.self_paced,
'progress_url': context.get('progress_url'),
}
)
@@ -280,14 +277,15 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
if content_milestones and self.runtime.user_is_staff:
return banner_text
- def _can_user_view_content(self):
+ def _can_user_view_content(self, course):
"""
Returns whether the runtime user can view the content
of this sequential.
"""
+ hidden_date = course.end if course.self_paced else self.due
return (
self.runtime.user_is_staff or
- self.verify_current_content_visibility(self.due, self.hide_after_due)
+ self.verify_current_content_visibility(hidden_date, self.hide_after_due)
)
def _student_view(self, context, banner_text=None):
diff --git a/common/lib/xmodule/xmodule/tests/test_sequence.py b/common/lib/xmodule/xmodule/tests/test_sequence.py
index 5643ada5ca..26112a6110 100644
--- a/common/lib/xmodule/xmodule/tests/test_sequence.py
+++ b/common/lib/xmodule/xmodule/tests/test_sequence.py
@@ -3,49 +3,46 @@ Tests for sequence module.
"""
# pylint: disable=no-member
from datetime import timedelta
-import ddt
from django.utils.timezone import now
from freezegun import freeze_time
-from mock import Mock
+from mock import Mock, patch
+from xmodule.seq_module import SequenceModule
from xmodule.tests import get_test_system
from xmodule.tests.helpers import StubUserService
-from xmodule.tests.xml import XModuleXmlImportTest
-from xmodule.tests.xml import factories as xml
+from xmodule.tests.xml import factories as xml, XModuleXmlImportTest
from xmodule.x_module import STUDENT_VIEW
-from xmodule.seq_module import SequenceModule
+
+TODAY = now()
+DUE_DATE = TODAY + timedelta(days=7)
+PAST_DUE_BEFORE_END_DATE = TODAY + timedelta(days=14)
+COURSE_END_DATE = TODAY + timedelta(days=21)
-@ddt.ddt
class SequenceBlockTestCase(XModuleXmlImportTest):
"""
- Tests for the Sequence Module.
+ Base class for tests of Sequence Module.
"""
- TODAY = now()
- TOMORROW = TODAY + timedelta(days=1)
- DAY_AFTER_TOMORROW = TOMORROW + timedelta(days=1)
+ def setUp(self):
+ super(SequenceBlockTestCase, self).setUp()
- @classmethod
- def setUpClass(cls):
- super(SequenceBlockTestCase, cls).setUpClass()
+ course_xml = self._set_up_course_xml()
+ self.course = self.process_xml(course_xml)
+ self._set_up_module_system(self.course)
- course_xml = cls._set_up_course_xml()
- cls.course = cls.process_xml(course_xml)
- cls._set_up_module_system(cls.course)
-
- for chapter_index in range(len(cls.course.get_children())):
- chapter = cls._set_up_block(cls.course, chapter_index)
- setattr(cls, 'chapter_{}'.format(chapter_index + 1), chapter)
+ for chapter_index in range(len(self.course.get_children())):
+ chapter = self._set_up_block(self.course, chapter_index)
+ setattr(self, 'chapter_{}'.format(chapter_index + 1), chapter)
for sequence_index in range(len(chapter.get_children())):
- sequence = cls._set_up_block(chapter, sequence_index)
- setattr(cls, 'sequence_{}_{}'.format(chapter_index + 1, sequence_index + 1), sequence)
+ sequence = self._set_up_block(chapter, sequence_index)
+ setattr(self, 'sequence_{}_{}'.format(chapter_index + 1, sequence_index + 1), sequence)
- @classmethod
- def _set_up_course_xml(cls):
+ @staticmethod
+ def _set_up_course_xml():
"""
Sets up and returns XML course structure.
"""
- course = xml.CourseFactory.build()
+ course = xml.CourseFactory.build(end=str(COURSE_END_DATE))
chapter_1 = xml.ChapterFactory.build(parent=course) # has 2 child sequences
xml.ChapterFactory.build(parent=course) # has 0 child sequences
@@ -58,7 +55,7 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
xml.SequenceFactory.build( # sequence_4_1
parent=chapter_4,
hide_after_due=str(True),
- due=str(cls.TOMORROW),
+ due=str(DUE_DATE),
)
for _ in range(3):
@@ -66,14 +63,13 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
return course
- @classmethod
- def _set_up_block(cls, parent, index_in_parent):
+ def _set_up_block(self, parent, index_in_parent):
"""
Sets up the stub sequence module for testing.
"""
block = parent.get_children()[index_in_parent]
- cls._set_up_module_system(block)
+ self._set_up_module_system(block)
block.xmodule_runtime._services['bookmarks'] = Mock() # pylint: disable=protected-access
block.xmodule_runtime._services['user'] = StubUserService() # pylint: disable=protected-access
@@ -81,8 +77,7 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
block.parent = parent.location
return block
- @classmethod
- def _set_up_module_system(cls, block):
+ def _set_up_module_system(self, block):
"""
Sets up the test module system for the given block.
"""
@@ -90,6 +85,28 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
module_system.descriptor_runtime = block._runtime # pylint: disable=protected-access
block.xmodule_runtime = module_system
+ def _get_rendered_student_view(self, sequence, requested_child=None, extra_context=None, self_paced=False):
+ """
+ Returns the rendered student view for the given sequence and the
+ requested_child parameter.
+ """
+ context = {'requested_child': requested_child}
+ if extra_context:
+ context.update(extra_context)
+
+ # The render operation will ask modulestore for the current course to get some data. As these tests were
+ # originally not written to be compatible with a real modulestore, we've mocked out the relevant return values.
+ with patch.object(SequenceModule, '_get_course') as mock_course:
+ self.course.self_paced = self_paced
+ mock_course.return_value = self.course
+ return sequence.xmodule_runtime.render(sequence, STUDENT_VIEW, context).content
+
+ def _assert_view_at_position(self, rendered_html, expected_position):
+ """
+ Verifies that the rendered view contains the expected position.
+ """
+ self.assertIn("'position': {}".format(expected_position), rendered_html)
+
def test_student_view_init(self):
seq_module = SequenceModule(runtime=Mock(position=2), descriptor=Mock(), scope_ids=Mock())
self.assertEquals(seq_module.position, 2) # matches position set in the runtime
@@ -112,22 +129,6 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
html = self._get_rendered_student_view(self.sequence_3_1, requested_child='last')
self._assert_view_at_position(html, expected_position=3)
- def _get_rendered_student_view(self, sequence, requested_child=None, extra_context=None):
- """
- Returns the rendered student view for the given sequence and the
- requested_child parameter.
- """
- context = {'requested_child': requested_child}
- if extra_context:
- context.update(extra_context)
- return sequence.xmodule_runtime.render(sequence, STUDENT_VIEW, context).content
-
- def _assert_view_at_position(self, rendered_html, expected_position):
- """
- Verifies that the rendered view contains the expected position.
- """
- self.assertIn("'position': {}".format(expected_position), rendered_html)
-
def test_tooltip(self):
html = self._get_rendered_student_view(self.sequence_3_1, requested_child=None)
for child in self.sequence_3_1.children:
@@ -138,26 +139,18 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
self.assertIn("seq_module.html", html)
self.assertIn("'banner_text': None", html)
- @freeze_time(DAY_AFTER_TOMORROW)
- @ddt.data(
- (None, 'subsection'),
- ('Homework', 'homework'),
- )
- @ddt.unpack
- def test_hidden_content_past_due(self, format_type, expected_text):
+ @freeze_time(COURSE_END_DATE)
+ def test_hidden_content_past_due(self):
progress_url = 'http://test_progress_link'
- self._set_sequence_format(self.sequence_4_1, format_type)
html = self._get_rendered_student_view(
self.sequence_4_1,
extra_context=dict(progress_url=progress_url),
)
self.assertIn("hidden_content.html", html)
self.assertIn(progress_url, html)
- self.assertIn("'subsection_format': '{}'".format(expected_text), html)
- @freeze_time(DAY_AFTER_TOMORROW)
+ @freeze_time(COURSE_END_DATE)
def test_masquerade_hidden_content_past_due(self):
- self._set_sequence_format(self.sequence_4_1, "Homework")
html = self._get_rendered_student_view(
self.sequence_4_1,
extra_context=dict(specific_masquerade=True),
@@ -165,13 +158,23 @@ class SequenceBlockTestCase(XModuleXmlImportTest):
self.assertIn("seq_module.html", html)
self.assertIn(
"'banner_text': 'Because the due date has passed, "
- "this homework is hidden from the learner.'",
+ "this assignment is hidden from the learner.'",
html
)
- def _set_sequence_format(self, sequence, format_type):
- """
- Sets the format field on the given sequence to the
- given value.
- """
- sequence._xmodule.format = format_type # pylint: disable=protected-access
+ @freeze_time(PAST_DUE_BEFORE_END_DATE)
+ def test_hidden_content_self_paced_past_due_before_end(self):
+ html = self._get_rendered_student_view(self.sequence_4_1, self_paced=True)
+ self.assertIn("seq_module.html", html)
+ self.assertIn("'banner_text': None", html)
+
+ @freeze_time(COURSE_END_DATE + timedelta(days=7))
+ def test_hidden_content_self_paced_past_end(self):
+ progress_url = 'http://test_progress_link'
+ html = self._get_rendered_student_view(
+ self.sequence_4_1,
+ extra_context=dict(progress_url=progress_url),
+ self_paced=True,
+ )
+ self.assertIn("hidden_content.html", html)
+ self.assertIn(progress_url, html)
diff --git a/common/test/acceptance/pages/lms/courseware.py b/common/test/acceptance/pages/lms/courseware.py
index d3826372ca..ef5381a49b 100644
--- a/common/test/acceptance/pages/lms/courseware.py
+++ b/common/test/acceptance/pages/lms/courseware.py
@@ -209,13 +209,13 @@ class CoursewarePage(CoursePage):
"""
return self.q(css="div.proctored-exam.completed").visible
- def content_hidden_past_due_date(self, content_type="subsection"):
+ def content_hidden_past_due_date(self):
"""
Returns whether the "the due date for this ___ has passed" message is present.
___ is the type of the hidden content, and defaults to subsection.
This being true implies "the ___ contents are hidden because their due date has passed".
"""
- message = "The due date for this {0} has passed.".format(content_type)
+ message = "this assignment is no longer available"
if self.q(css="div.seq_content").is_present():
return False
for html in self.q(css="div.hidden-content").html:
diff --git a/lms/djangoapps/course_blocks/transformers/hidden_content.py b/lms/djangoapps/course_blocks/transformers/hidden_content.py
index 4e1597513e..3f2e2275c2 100644
--- a/lms/djangoapps/course_blocks/transformers/hidden_content.py
+++ b/lms/djangoapps/course_blocks/transformers/hidden_content.py
@@ -25,7 +25,7 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
Staff users are exempted from hidden content rules.
"""
- VERSION = 1
+ VERSION = 2
MERGED_DUE_DATE = 'merged_due_date'
MERGED_HIDE_AFTER_DUE = 'merged_hide_after_due'
@@ -41,7 +41,7 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
def _get_merged_hide_after_due(cls, block_structure, block_key):
"""
Returns whether the block with the given block_key in the
- given block_structure should be visible to staff only per
+ given block_structure should be hidden after due date per
computed value from ancestry chain.
"""
return block_structure.get_transformer_block_field(
@@ -81,6 +81,8 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
func_merge_ancestors=min,
)
+ block_structure.request_xblock_fields(u'self_paced', u'end')
+
def transform_block_filters(self, usage_info, block_structure):
# Users with staff access bypass the Visibility check.
if usage_info.has_staff_access:
@@ -97,6 +99,10 @@ class HiddenContentTransformer(FilteringTransformerMixin, BlockStructureTransfor
Returns whether the block with the given block_key should
be hidden, given the current time.
"""
- due = self._get_merged_due_date(block_structure, block_key)
hide_after_due = self._get_merged_hide_after_due(block_structure, block_key)
- return not SequenceModule.verify_current_content_visibility(due, hide_after_due)
+ self_paced = block_structure[block_structure.root_block_usage_key].self_paced
+ if self_paced:
+ hidden_date = block_structure[block_structure.root_block_usage_key].end
+ else:
+ hidden_date = self._get_merged_due_date(block_structure, block_key)
+ return not SequenceModule.verify_current_content_visibility(hidden_date, hide_after_due)
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index e6c3b228cc..7ee98fbcb5 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -199,7 +199,7 @@ class IndexQueryTestCase(ModuleStoreTestCase):
NUM_PROBLEMS = 20
@ddt.data(
- (ModuleStoreEnum.Type.mongo, 8),
+ (ModuleStoreEnum.Type.mongo, 9),
(ModuleStoreEnum.Type.split, 4),
)
@ddt.unpack
diff --git a/lms/djangoapps/grades/signals/handlers.py b/lms/djangoapps/grades/signals/handlers.py
index fa05873c45..74bd721acc 100644
--- a/lms/djangoapps/grades/signals/handlers.py
+++ b/lms/djangoapps/grades/signals/handlers.py
@@ -4,15 +4,14 @@ Grades related signals.
from logging import getLogger
-from courseware.model_data import get_score, set_score
from django.dispatch import receiver
-from openedx.core.lib.grade_utils import is_score_higher
from submissions.models import score_set, score_reset
-from util.date_utils import to_timestamp
from courseware.model_data import get_score, set_score
from eventtracking import tracker
+from openedx.core.lib.grade_utils import is_score_higher
from student.models import user_by_anonymous_id
+from util.date_utils import to_timestamp
from track.event_transaction_utils import (
get_event_transaction_type,
get_event_transaction_id,
diff --git a/lms/djangoapps/grades/tasks.py b/lms/djangoapps/grades/tasks.py
index c58647adc4..6a5a235839 100644
--- a/lms/djangoapps/grades/tasks.py
+++ b/lms/djangoapps/grades/tasks.py
@@ -11,6 +11,7 @@ from logging import getLogger
from courseware.model_data import get_score
from lms.djangoapps.course_blocks.api import get_course_blocks
+from openedx.core.djangoapps.celery_utils.task import PersistOnFailureTask
from opaque_keys.edx.keys import UsageKey
from opaque_keys.edx.locator import CourseLocator
from submissions import api as sub_api
@@ -54,7 +55,7 @@ def recalculate_subsection_grade(
)
-@task(default_retry_delay=30, routing_key=settings.RECALCULATE_GRADES_ROUTING_KEY)
+@task(base=PersistOnFailureTask, default_retry_delay=30, routing_key=settings.RECALCULATE_GRADES_ROUTING_KEY)
def recalculate_subsection_grade_v2(**kwargs):
"""
Updates a saved subsection grade.
diff --git a/lms/envs/common.py b/lms/envs/common.py
index c826fd1b9f..cc2145e9e9 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2153,6 +2153,10 @@ INSTALLED_APPS = (
# additional release utilities to ease automation
'release_util',
+
+ # Customized celery tasks, including persisting failed tasks so they can
+ # be retried
+ 'openedx.core.djangoapps.celery_utils',
)
# Migrations which are not in the standard module "migrations"
diff --git a/lms/templates/hidden_content.html b/lms/templates/hidden_content.html
index 7e6f4b5c04..33d7b79a7e 100644
--- a/lms/templates/hidden_content.html
+++ b/lms/templates/hidden_content.html
@@ -5,22 +5,35 @@ from openedx.core.djangolib.markup import HTML, Text
%>
-
- ${_("The due date for this {subsection_format} has passed.").format(
- subsection_format=subsection_format,
- )}
-
-
-
- ${Text(_(
- "Because the due date has passed, this {subsection_format} "
- "is no longer available.{line_break}If you have completed this {subsection_format}, "
- "your grade is available on the {link_start}progress page{link_end}."
- )).format(
- subsection_format=subsection_format,
- line_break=HTML("
"),
- link_start=HTML("").format(progress_url),
- link_end=HTML(""),
- )}
-
+
+ % if self_paced:
+ ${_("The course has ended.")}
+ % else:
+ ${_("The due date for this assignment has passed.")}
+ % endif
+
+
+
+ % if self_paced:
+ ${Text(_(
+ "Because the course has ended, this assignment is no longer "
+ "available.{line_break}If you have completed this assignment, your "
+ "grade is available on the {link_start}progress page{link_end}."
+ )).format(
+ line_break=HTML("
"),
+ link_start=HTML("").format(progress_url),
+ link_end=HTML(""),
+ )}
+ % else:
+ ${Text(_(
+ "Because the due date has passed, this assignment is no longer "
+ "available.{line_break}If you have completed this assignment, your "
+ "grade is available on the {link_start}progress page{link_end}."
+ )).format(
+ line_break=HTML("
"),
+ link_start=HTML("").format(progress_url),
+ link_end=HTML(""),
+ )}
+ % endif
+