From 18b5d10d6485f6f6e0490e00daf49321eedacafc Mon Sep 17 00:00:00 2001
From: Agrendalath <piotr@surowiec.it>
Date: Thu, 27 Apr 2023 16:30:00 +0200
Subject: [PATCH 1/2] feat: add Waffle Flag to disable resetting self-paced
 deadlines by learners

---
 openedx/features/course_experience/api/v1/tests/test_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openedx/features/course_experience/api/v1/tests/test_views.py b/openedx/features/course_experience/api/v1/tests/test_views.py
index afc671dbf91f..8cef39053b3e 100644
--- a/openedx/features/course_experience/api/v1/tests/test_views.py
+++ b/openedx/features/course_experience/api/v1/tests/test_views.py
@@ -15,7 +15,7 @@
 from lms.djangoapps.courseware.tests.helpers import MasqueradeMixin
 from openedx.core.djangoapps.schedules.models import Schedule
 from openedx.features.course_experience import RELATIVE_DATES_DISABLE_RESET_FLAG, RELATIVE_DATES_FLAG
-from xmodule.modulestore.tests.factories import CourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.modulestore.tests.factories import CourseFactory
 
 
 @ddt.ddt

From b0094144cd3710625973f247f9f671fcd592177c Mon Sep 17 00:00:00 2001
From: Daniel Valenzuela <daniel.valenzuela@opencraft.com>
Date: Wed, 13 Mar 2024 21:33:03 -0300
Subject: [PATCH 2/2] feat: warn when relative dates are past due and can't be
 shifted

---
 lms/templates/problem.html                       | 16 +++++++++-------
 lms/templates/vert_module.html                   |  2 +-
 openedx/features/course_experience/utils.py      | 10 ++++++++--
 .../call_to_action.py                            | 16 ++++++++++++----
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/lms/templates/problem.html b/lms/templates/problem.html
index 60d27b4ff5ad..4c70bf50c019 100644
--- a/lms/templates/problem.html
+++ b/lms/templates/problem.html
@@ -68,7 +68,8 @@ <h3 class="hd hd-3 problem-header" id="${ short_id }-problem-title" aria-describ
           </span>
           <span class="sr">(${submit_disabled_cta['description']})</span>
         % else:
-            <form class="submit-cta" method="post" action="${submit_disabled_cta['link']}">
+          <form class="submit-cta" method="post" action="${submit_disabled_cta.get('link')}">
+            % if submit_disabled_cta.get('link'):
               <input type="hidden" id="csrf_token" name="csrfmiddlewaretoken" value="${csrf_token}">
               % for form_name, form_value in submit_disabled_cta['form_values'].items():
                   <input type="hidden" name="${form_name}" value="${form_value}">
@@ -76,13 +77,14 @@ <h3 class="hd hd-3 problem-header" id="${ short_id }-problem-title" aria-describ
               <button class="submit-cta-link-button btn-link btn-small">
                 ${submit_disabled_cta['link_name']}
               </button>
-              <span class="submit-cta-description" tabindex="0" role="note" aria-label="description">
-                <span data-tooltip="${submit_disabled_cta['description']}" data-tooltip-show-on-click="true"
-                  class="fa fa-info-circle fa-lg" aria-hidden="true">
-                </span>
+            % endif
+            <span class="submit-cta-description" tabindex="0" role="note" aria-label="description">
+              <span data-tooltip="${submit_disabled_cta['description']}" data-tooltip-show-on-click="true"
+                class="fa fa-info-circle fa-lg" aria-hidden="true">
               </span>
-              <span class="sr">(${submit_disabled_cta['description']})</span>
-            </form>
+            </span>
+            <span class="sr">(${submit_disabled_cta['description']})</span>
+          </form>
         % endif
       % endif
       <div class="submission-feedback ${'cta-enabled' if submit_disabled_cta else ''}" id="submission_feedback_${short_id}">
diff --git a/lms/templates/vert_module.html b/lms/templates/vert_module.html
index 0e52e3c7f426..7df5b8b5b46e 100644
--- a/lms/templates/vert_module.html
+++ b/lms/templates/vert_module.html
@@ -44,7 +44,7 @@ <h2 class="hd hd-2 unit-title">${unit_title}</h2>
         <div class="banner-cta-button">
             <button class="btn btn-outline-primary" onclick="emit_event(${vertical_banner_cta['event_data']})">${vertical_banner_cta['link_name']}</button>
         </div>
-      % else:
+      % elif vertical_banner_cta.get('link'):
         <div class="banner-cta-button">
           <form method="post" action="${vertical_banner_cta['link']}">
             <input type="hidden" id="csrf_token" name="csrfmiddlewaretoken" value="${csrf_token}">
diff --git a/openedx/features/course_experience/utils.py b/openedx/features/course_experience/utils.py
index d58b54f6139f..be2924e32e24 100644
--- a/openedx/features/course_experience/utils.py
+++ b/openedx/features/course_experience/utils.py
@@ -140,13 +140,19 @@ def get_start_block(block):
     return get_start_block(first_child)
 
 
-def dates_banner_should_display(course_key, user):
+def dates_banner_should_display(course_key, user, allow_warning=False):
     """
     Return whether or not the reset banner should display,
     determined by whether or not a course has any past-due,
     incomplete sequentials and which enrollment mode is being
     dealt with for the current user and course.
 
+    Args:
+        course_key (CourseKey)
+        user (User)
+        allow_warning (bool): whether to ignore relative_dates_disable_reset_flag, in order to render
+            warnings for past-due incomplete units.
+
     Returns:
         (missed_deadlines, missed_gated_content):
             missed_deadlines is True if the user has missed any graded content deadlines
@@ -155,7 +161,7 @@ def dates_banner_should_display(course_key, user):
     if not RELATIVE_DATES_FLAG.is_enabled(course_key):
         return False, False
 
-    if RELATIVE_DATES_DISABLE_RESET_FLAG.is_enabled(course_key):
+    if RELATIVE_DATES_DISABLE_RESET_FLAG.is_enabled(course_key) and not allow_warning:
         # The `missed_deadlines` value is ignored by `reset_course_deadlines` views. Instead, they check the value of
         # `missed_gated_content` to determine if learners can reset the deadlines by themselves.
         # We could have added this logic directly to `reset_self_paced_schedule`, but this function is used in other
diff --git a/openedx/features/personalized_learner_schedules/call_to_action.py b/openedx/features/personalized_learner_schedules/call_to_action.py
index 530b4838c0f7..634c425b38bd 100644
--- a/openedx/features/personalized_learner_schedules/call_to_action.py
+++ b/openedx/features/personalized_learner_schedules/call_to_action.py
@@ -13,6 +13,7 @@
 from xmodule.util.misc import is_xblock_an_assignment
 from openedx.core.djangolib.markup import HTML, Text
 from openedx.core.lib.mobile_utils import is_request_from_mobile_app
+from openedx.features.course_experience import RELATIVE_DATES_DISABLE_RESET_FLAG
 from openedx.features.course_experience.url_helpers import is_request_from_learning_mfe
 from openedx.features.course_experience.utils import dates_banner_should_display
 
@@ -37,7 +38,10 @@ def get_ctas(self, xblock, category, completed):
         request = get_current_request()
 
         course_key = xblock.scope_ids.usage_id.context_key
-        missed_deadlines, missed_gated_content = dates_banner_should_display(course_key, request.user)
+        missed_deadlines, missed_gated_content = dates_banner_should_display(
+            course_key, request.user, allow_warning=True
+        )
+
         # Not showing in the missed_gated_content case because those learners are not eligible
         # to shift due dates.
         if missed_gated_content:
@@ -52,13 +56,13 @@ def get_ctas(self, xblock, category, completed):
             # xblock is a capa problem, and the submit button is disabled. Check if it's because of a personalized
             # schedule due date being missed, and if so, we can offer to shift it.
             if self._is_block_shiftable(xblock, category):
-                ctas.append(self._make_reset_deadlines_cta(xblock, category, is_learning_mfe))
+                ctas.append(self._make_deadlines_cta(course_key, xblock, category, is_learning_mfe))
 
         elif category == self.VERTICAL_BANNER and not completed and missed_deadlines:
             # xblock is a vertical, so we'll check all the problems inside it. If there are any that will show a
             # a "shift dates" CTA under CAPA_SUBMIT_DISABLED, then we'll also show the same CTA as a vertical banner.
             if any(self._is_block_shiftable(item, category) for item in xblock.get_children()):
-                ctas.append(self._make_reset_deadlines_cta(xblock, category, is_learning_mfe))
+                ctas.append(self._make_deadlines_cta(course_key, xblock, category, is_learning_mfe))
 
         return ctas
 
@@ -107,11 +111,15 @@ def _log_past_due_warning(name):
         PersonalizedLearnerScheduleCallToAction.past_due_class_warnings.add(name)
 
     @classmethod
-    def _make_reset_deadlines_cta(cls, xblock, category, is_learning_mfe=False):
+    def _make_deadlines_cta(cls, course_key, xblock, category, is_learning_mfe=False):
         """
         Constructs a call to action object containing the necessary information for the view
         """
         from lms.urls import RESET_COURSE_DEADLINES_NAME
+
+        if RELATIVE_DATES_DISABLE_RESET_FLAG.is_enabled(course_key):
+            return {"description": _("The deadline to complete this assignment has passed.")}
+
         course_key = xblock.scope_ids.usage_id.context_key
 
         cta_data = {