Merge pull request #1126 from alphagov/dev

v0.7.39 - Rename '12-week acknowledged' to '12-week received'

Author: ahernp

accessibility_monitoring_platform/apps/common/sitemap.py

@@ -40,8 +40,8 @@
     RetestComplianceDecisionsUpdateForm,
     RetestResultUpdateForm,
     StatementEnforcementUpdateForm,
-    TwelveWeekAcknowledgedUpdateForm,
     TwelveWeekDeadlineUpdateForm,
+    TwelveWeekReceivedUpdateForm,
     TwelveWeekRequestUpdateForm,
     UnresponsivePSBUpdateForm,
 )
@@ -1579,18 +1579,18 @@ def __init__(self, type=PlatformPageGroup.Type.MOBILE_CASE_NAV, **kwargs):
                 next_page_url_name="detailed:edit-12-week-request-update",
             ),
             DetailedCasePlatformPage(
-                name="12-week update request",
+                name="12-week update requested",
                 url_name="detailed:edit-12-week-request-update",
                 complete_flag_name="twelve_week_update_complete_date",
                 case_details_form_class=TwelveWeekRequestUpdateForm,
                 case_details_template_name="cases/details/details.html",
-                next_page_url_name="detailed:edit-12-week-acknowledged",
+                next_page_url_name="detailed:edit-12-week-received",
             ),
             DetailedCasePlatformPage(
-                name="12-week acknowledged",
-                url_name="detailed:edit-12-week-acknowledged",
-                complete_flag_name="twelve_week_acknowledged_complete_date",
-                case_details_form_class=TwelveWeekAcknowledgedUpdateForm,
+                name="12-week received",
+                url_name="detailed:edit-12-week-received",
+                complete_flag_name="twelve_week_received_complete_date",
+                case_details_form_class=TwelveWeekReceivedUpdateForm,
                 case_details_template_name="cases/details/details.html",
                 next_page_url_name="detailed:edit-retest-result",
             ),

accessibility_monitoring_platform/apps/detailed/csv_export.py

@@ -529,16 +529,16 @@
         source_class=DetailedCase,
         source_attr="twelve_week_update_complete_date",
     ),
-    # Correspondence - 12-week acknowledged
+    # Correspondence - 12-week received
     CSVColumn(
-        column_header="12-week update acknowledged",
+        column_header="12-week update received",
         source_class=DetailedCase,
-        source_attr="twelve_week_acknowledged_date",
+        source_attr="twelve_week_received_date",
     ),
     CSVColumn(
-        column_header="Correspondence 12-week acknowledged page complete",
+        column_header="Correspondence 12-week received page complete",
         source_class=DetailedCase,
-        source_attr="twelve_week_acknowledged_complete_date",
+        source_attr="twelve_week_received_complete_date",
     ),
     # Reviewing changes - Retest result
     CSVColumn(

accessibility_monitoring_platform/apps/detailed/forms.py

@@ -441,18 +441,18 @@ class Meta:
         ]
 
 
-class TwelveWeekAcknowledgedUpdateForm(VersionForm):
-    """Form for updating correspondence 12-week acknowledged page"""
+class TwelveWeekReceivedUpdateForm(VersionForm):
+    """Form for updating correspondence 12-week received page"""
 
-    twelve_week_acknowledged_date = AMPDateField(label="12-week update acknowledged")
-    twelve_week_acknowledged_complete_date = AMPDatePageCompleteField()
+    twelve_week_received_date = AMPDateField(label="12-week update received")
+    twelve_week_received_complete_date = AMPDatePageCompleteField()
 
     class Meta:
         model = DetailedCase
         fields = [
             "version",
-            "twelve_week_acknowledged_date",
-            "twelve_week_acknowledged_complete_date",
+            "twelve_week_received_date",
+            "twelve_week_received_complete_date",
         ]
 
 

accessibility_monitoring_platform/apps/detailed/migrations/0007_rename_twelve_week_acknowledged_complete_date_detailedcase_twelve_week_received_complete_date_and_mo.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.6 on 2025-10-13 07:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("detailed", "0006_detailedcase_case_recommendation_complete_date"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="detailedcase",
+            old_name="twelve_week_acknowledged_complete_date",
+            new_name="twelve_week_received_complete_date",
+        ),
+        migrations.RenameField(
+            model_name="detailedcase",
+            old_name="twelve_week_acknowledged_date",
+            new_name="twelve_week_received_date",
+        ),
+    ]

accessibility_monitoring_platform/apps/detailed/models.py

@@ -160,9 +160,9 @@ class ServiceType(models.TextChoices):
     twelve_week_update_date = models.DateField(null=True, blank=True)
     twelve_week_update_complete_date = models.DateField(null=True, blank=True)
 
-    # Correspondence - Report acknowledged
-    twelve_week_acknowledged_date = models.DateField(null=True, blank=True)
-    twelve_week_acknowledged_complete_date = models.DateField(null=True, blank=True)
+    # Correspondence - 12-week received
+    twelve_week_received_date = models.DateField(null=True, blank=True)
+    twelve_week_received_complete_date = models.DateField(null=True, blank=True)
 
     # Reviewing changes - Retest result
     retest_start_date = models.DateField(null=True, blank=True)

accessibility_monitoring_platform/apps/detailed/urls.py

@@ -17,8 +17,8 @@
     ContactUpdateView,
     CorrespondenceReportAcknowledgedUpdateView,
     CorrespondenceReportSentUpdateView,
-    CorrespondenceTwelveWeekAcknowledgedUpdateView,
     CorrespondenceTwelveWeekDeadlineUpdateView,
+    CorrespondenceTwelveWeekReceivedUpdateView,
     CorrespondenceTwelveWeekRequestUpdateView,
     DetailedCaseCreateView,
     DetailedCaseHistoryDetailView,
@@ -179,9 +179,9 @@
         name="edit-12-week-request-update",
     ),
     path(
-        "<int:pk>/edit-12-week-acknowledged/",
-        login_required(CorrespondenceTwelveWeekAcknowledgedUpdateView.as_view()),
-        name="edit-12-week-acknowledged",
+        "<int:pk>/edit-12-week-received/",
+        login_required(CorrespondenceTwelveWeekReceivedUpdateView.as_view()),
+        name="edit-12-week-received",
     ),
     path(
         "<int:pk>/edit-retest-result/",

accessibility_monitoring_platform/apps/detailed/views.py

@@ -61,8 +61,8 @@
     RetestComplianceDecisionsUpdateForm,
     RetestResultUpdateForm,
     StatementEnforcementUpdateForm,
-    TwelveWeekAcknowledgedUpdateForm,
     TwelveWeekDeadlineUpdateForm,
+    TwelveWeekReceivedUpdateForm,
     TwelveWeekRequestUpdateForm,
     UnresponsivePSBUpdateForm,
     ZendeskTicketConfirmDeleteUpdateForm,
@@ -510,12 +510,10 @@ class CorrespondenceTwelveWeekRequestUpdateView(CorrespondenceUpdateView):
     form_class: type[TwelveWeekRequestUpdateForm] = TwelveWeekRequestUpdateForm
 
 
-class CorrespondenceTwelveWeekAcknowledgedUpdateView(CorrespondenceUpdateView):
-    """View to update correspondence 12-week acknowledged"""
+class CorrespondenceTwelveWeekReceivedUpdateView(CorrespondenceUpdateView):
+    """View to update correspondence 12-week received"""
 
-    form_class: type[TwelveWeekAcknowledgedUpdateForm] = (
-        TwelveWeekAcknowledgedUpdateForm
-    )
+    form_class: type[TwelveWeekReceivedUpdateForm] = TwelveWeekReceivedUpdateForm
 
 
 class RetestResultUpdateView(DetailedCaseUpdateView):

stack_tests/integration_tests/cypress/e2e/new_detailed_case.cy.js

@@ -63,10 +63,10 @@ describe('Create detailed case', () => {
     cy.title().should('eq', `${newOrganisationName} | Report acknowledged`)
     cy.contains('Save and continue').click()
 
-    cy.title().should('eq', `${newOrganisationName} | 12-week update request`)
+    cy.title().should('eq', `${newOrganisationName} | 12-week update requested`)
     cy.contains('Save and continue').click()
 
-    cy.title().should('eq', `${newOrganisationName} | 12-week acknowledged`)
+    cy.title().should('eq', `${newOrganisationName} | 12-week received`)
     cy.contains('Save and continue').click()
 
     cy.title().should('eq', `${newOrganisationName} | Retest result`)