Merge pull request #1108 from alphagov/2083-rm-summary-from-csv

2083: Remove Summary of progress made / response from PSB column from equality body CSVs

Author: ahernp

accessibility_monitoring_platform/apps/cases/tests/test_csv_export.py

@@ -122,7 +122,7 @@ def test_populate_equality_body_columns():
     )
     row: list[CSVColumn] = populate_equality_body_columns(case=simplified_case)
 
-    assert len(row) == 30
+    assert len(row) == 29
 
     contact_details: list[EqualityBodyCSVColumn] = [
         cell for cell in row if cell.column_header == "Contact details"

accessibility_monitoring_platform/apps/detailed/csv_export.py

@@ -18,7 +18,7 @@
     CSVColumn(
         column_header="Case number",
         source_class=DetailedCase,
-        source_attr="case_number",
+        source_attr="case_identifier",
     ),
     CSVColumn(
         column_header="Organisation",
@@ -70,11 +70,6 @@
         source_class=DetailedCase,
         source_attr="recommendation_info",
     ),
-    CSVColumn(
-        column_header="Summary of progress made / response from PSB",
-        source_class=DetailedCase,
-        source_attr="psb_progress_info",
-    ),
     CSVColumn(
         column_header="Contact details",
         source_class=DetailedCase,

accessibility_monitoring_platform/apps/detailed/forms.py

@@ -518,9 +518,7 @@ class Meta:
 class CaseCloseUpdateForm(VersionForm):
     """Form for updating closing the case page"""
 
-    psb_progress_info = AMPTextField(
-        label="Progress summary and PSB response · Included in export"
-    )
+    psb_progress_info = AMPTextField(label="Progress summary and PSB response")
     recommendation_for_enforcement = AMPChoiceRadioField(
         label="Enforcement recommendation · Included in export",
         choices=DetailedCase.RecommendationForEnforcement.choices,

accessibility_monitoring_platform/apps/detailed/tests/test_utils.py

@@ -267,7 +267,7 @@ def test_download_equality_body_detailed_cases():
     expected_first_data_row: list[str] = [
         "EHRC",
         "Detailed",
-        "1",
+        "#D-1",
         "",
         "",
         "",
@@ -278,7 +278,6 @@ def test_download_equality_body_detailed_cases():
         "",
         "Not selected",
         "",
-        "",
         "Detailed contact details\nDetailed contact notes\n",
         "No",
         "",

accessibility_monitoring_platform/apps/exports/tests/test_utils.py

@@ -39,7 +39,7 @@ def test_download_equality_body_simplified_cases():
     expected_first_data_row: list[str] = [
         "EHRC",
         "Simplified",
-        "1",
+        "#S-1",
         "",
         "",
         "",
@@ -51,7 +51,6 @@ def test_download_equality_body_simplified_cases():
         "Not selected",
         "",
         "",
-        "",
         "No",
         "",
         "",

accessibility_monitoring_platform/apps/simplified/csv_export.py

@@ -31,7 +31,7 @@
     EqualityBodyCSVColumn(
         column_header="Case number",
         source_class=SimplifiedCase,
-        source_attr="case_number",
+        source_attr="case_identifier",
         required=True,
         edit_url_class=SimplifiedCase,
         edit_url_name=None,
@@ -126,15 +126,6 @@
         edit_url_name="simplified:edit-enforcement-recommendation",
         edit_url_anchor="id_recommendation_notes-label",
     ),
-    EqualityBodyCSVColumn(
-        column_header="Summary of progress made / response from PSB",
-        source_class=SimplifiedCase,
-        source_attr="psb_progress_notes",
-        data_type="markdown",
-        edit_url_class=SimplifiedCase,
-        edit_url_name="simplified:edit-review-changes",
-        edit_url_anchor="id_psb_progress_notes-label",
-    ),
 ]
 SIMPLIFIED_EQUALITY_BODY_CORRESPONDENCE_COLUMNS_FOR_EXPORT: list[
     EqualityBodyCSVColumn

accessibility_monitoring_platform/apps/simplified/forms.py

@@ -717,7 +717,7 @@ class CaseReviewChangesUpdateForm(VersionForm):
         label="Retested website? (included in equality body export)"
     )
     psb_progress_notes = AMPTextField(
-        label="Summary of progress made from public sector body (included in equality body export)"
+        label="Summary of progress made from public sector body"
     )
     is_ready_for_final_decision = AMPChoiceRadioField(
         label="Is this case ready for final decision?",

accessibility_monitoring_platform/apps/simplified/models.py

@@ -624,31 +624,31 @@ def audit(self):
             return None
 
     @property
-    def not_archived(self):
+    def not_archived(self) -> bool:
         return self.archive == ""
 
     @property
-    def show_start_test(self):
+    def show_start_test(self) -> bool:
         return self.not_archived and self.audit is None
 
     @property
-    def not_archived_has_audit(self):
+    def not_archived_has_audit(self) -> bool:
         return self.not_archived and self.audit is not None
 
     @property
-    def report_acknowledged_yes_no(self):
+    def report_acknowledged_yes_no(self) -> str:
         return "Yes" if self.report_acknowledged_date else "No"
 
     @property
-    def show_start_12_week_retest(self):
+    def show_start_12_week_retest(self) -> bool:
         return (
             self.not_archived
             and self.audit is not None
             and self.audit.retest_date is None
         )
 
     @property
-    def show_12_week_retest(self):
+    def show_12_week_retest(self) -> bool:
         return (
             self.not_archived
             and self.audit is not None
@@ -663,26 +663,26 @@ def report(self):
             return None
 
     @property
-    def show_create_report(self):
+    def show_create_report(self) -> bool:
         return self.not_archived and self.report is None
 
     @property
-    def not_archived_has_report(self):
+    def not_archived_has_report(self) -> bool:
         return self.not_archived and self.report is not None
 
     @property
-    def published_report_url(self):
+    def published_report_url(self) -> str:
         if self.report and self.report.latest_s3_report:
             return f"{settings.AMP_PROTOCOL}{settings.AMP_VIEWER_DOMAIN}/reports/{self.report.latest_s3_report.guid}"
         else:
             return ""
 
     @property
-    def previous_case_identifier(self):
+    def previous_case_identifier(self) -> str | None:
         return get_previous_case_identifier(previous_case_url=self.previous_case_url)
 
     @property
-    def last_edited(self):
+    def last_edited(self) -> datetime:
         """Return when case or related data was last changed"""
         updated_times: list[datetime | None] = [self.created, self.updated]
 
@@ -767,15 +767,15 @@ def percentage_website_issues_fixed(self) -> int:
         return int(fixed_checks_count * 100 / failed_checks_count)
 
     @property
-    def csv_export_statement_initially_found(self) -> int:
+    def csv_export_statement_initially_found(self) -> str:
         if self.audit is None:
             return "unknown"
         if self.audit.statement_initially_found:
             return "Yes"
         return "No"
 
     @property
-    def csv_export_statement_found_at_12_week_retest(self) -> int:
+    def csv_export_statement_found_at_12_week_retest(self) -> str:
         if self.audit is None:
             return "unknown"
         if self.audit.statement_found_at_12_week_retest: